remove app, use global variables instead

also some unrelated combobox fixes

1 files changed, 6 insertions, 10 deletions

diff --git a/alf/alfpriv.h b/alf/alfpriv.h
index 61d7b39..c3a7fb9 100644
--- a/alf/alfpriv.h
+++ b/alf/alfpriv.h
@@ -18,7 +18,6 @@
 #include "alflayout.h"
 
 typedef struct {
-    ALFAPP              app;
     ALFWindowVTable    *vtbl;
     void               *closure;
     ALFWindowFonts      fonts;
@@ -28,12 +27,9 @@ typedef struct {
     HWND                hwndFocus;
 } ALFWindowPriv;
 
-struct ALFAppPriv {
-    HINSTANCE           hInstance;
-    TCHAR              *comboClass;
-    TCHAR              *panelClass;
-    TCHAR              *spacerClass;
-};
+extern TCHAR *_alf_comboClass;
+extern TCHAR *_alf_panelClass;
+extern TCHAR *_alf_spacerClass;
 
 int
 ALF_CentipointsToPxPriv(ALFWindowPriv *priv, int cptValue);
@@ -48,13 +44,13 @@ BOOL
 ALF_PreTranslateMessagePriv(HWND win, ALFWindowPriv *priv, MSG *message);
 
 void
-ALF_RegisterComboClass(ALFAPP app);
+ALF_RegisterComboClass(void);
 
 void
-ALF_RegisterPanelClass(ALFAPP app);
+ALF_RegisterPanelClass(void);
 
 void
-ALF_RegisterSpacerClass(ALFAPP app);
+ALF_RegisterSpacerClass(void);
 
 void
 ALF_BuildRandomClassName(const TCHAR *prefix, TCHAR *buf, DWORD cchBuf);