remove app, use global variables instead

also some unrelated combobox fixes

1 files changed, 10 insertions, 13 deletions

diff --git a/alf/alfpanel.cpp b/alf/alfpanel.cpp
index b70dbf9..58f933e 100644
--- a/alf/alfpanel.cpp
+++ b/alf/alfpanel.cpp
@@ -1,14 +1,14 @@
 #include "alfpriv.h"
 
+TCHAR *_alf_panelClass = NULL;
+
 typedef struct {
-    ALFAPP    app;
     ALFLayout layout;
 } ALFPanelPriv;
 
 static void
-ALF_Panel_IntializePriv(ALFPanelPriv *priv, ALFAPP app)
+ALF_Panel_IntializePriv(ALFPanelPriv *priv)
 {
-    priv->app = app;
     ALF_Layout_Init(&priv->layout);
 }
 
@@ -24,8 +24,7 @@ ALF__PanelWindowProc(HWND window, UINT msg, WPARAM wparam, LPARAM lparam)
     if (msg == WM_NCCREATE) {
         ALFPanelPriv *p = ALF_New(ALFPanelPriv, 1);
 
-        ALFAPP app = (ALFAPP)(((CREATESTRUCT*)lparam)->lpCreateParams);
-        ALF_Panel_IntializePriv(p, app);
+        ALF_Panel_IntializePriv(p);
 
         SetWindowLongPtr(window, 0, (LONG_PTR)p);
     }
@@ -53,7 +52,7 @@ ALF__PanelWindowProc(HWND window, UINT msg, WPARAM wparam, LPARAM lparam)
 }
 
 void
-ALF_RegisterPanelClass(ALFAPP app)
+ALF_RegisterPanelClass(void)
 {
     WNDCLASS cls;
     ZeroMemory(&cls, sizeof(cls));
@@ -61,7 +60,7 @@ ALF_RegisterPanelClass(ALFAPP app)
     TCHAR  classNameBuf[256];
     ALF_BuildRandomClassName(TEXT("ALFPanel"), classNameBuf, 256);
 
-    cls.hInstance = app->hInstance;
+    cls.hInstance = ALF_HINSTANCE;
     cls.hCursor = LoadCursor(NULL, (LPTSTR)IDC_ARROW);
     if (LOBYTE(LOWORD(GetVersion())) >= 4) {
         cls.hbrBackground = (HBRUSH)(COLOR_BTNFACE+1);
@@ -77,23 +76,21 @@ ALF_RegisterPanelClass(ALFAPP app)
     if (!classatom)
         MessageBox(NULL, TEXT("FATAL: Could not register Combo class"), NULL, MB_OK);
 
-    app->panelClass = MAKEINTATOM(classatom);
+    _alf_panelClass = MAKEINTATOM(classatom);
 }
 
 HWND
 ALF_AddPanel(HWND parent, WORD id, UINT x, UINT y)
 {
-    ALFAPP app = ALF_ApplicationFromWindow(parent);
-
     HWND hwndPanel = CreateWindowEx(WS_EX_CONTROLPARENT,
-                                    app->panelClass,
+                                    _alf_panelClass,
                                     TEXT(""),
                                     WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN,
                                     0, 0, 0, 0,
                                     parent,
                                     (HMENU)(int)id,
-                                    (HINSTANCE)GetWindowLongPtr(parent, GWLP_HINSTANCE),
-                                    (void*)app);
+                                    ALF_HINSTANCE,
+                                    NULL);
 
     ALFWidgetLayoutParams p;
     ZeroMemory(&p, sizeof(p));