comctl32: Don't override controls when there is no theme configured.

Vitaliy Margolen wine-patch at kievinfo.com
Tue Oct 18 13:57:14 CDT 2005


This fixes all the problems theming introduced. All what you need to do
(actually you don't need to do anything<g>) is not configure thimeing with
winecfg.

Vitaliy Margolen

changelog:
  comctl32
  - Don't override controls when there is no theme configured.
-------------- next part --------------
Index: dlls/comctl32/commctrl.c
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/commctrl.c,v
retrieving revision 1.98
diff -u -p -r1.98 commctrl.c
--- dlls/comctl32/commctrl.c	12 Sep 2005 11:10:58 -0000	1.98
+++ dlls/comctl32/commctrl.c	18 Oct 2005 18:49:33 -0000
@@ -70,6 +70,7 @@
 #include "shlwapi.h"
 #include "comctl32.h"
 #include "wine/debug.h"
+#include "uxtheme.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(commctrl);
 
@@ -145,8 +146,9 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, 
             TREEVIEW_Register ();
             UPDOWN_Register ();
 
-            /* subclass user32 controls */
-            THEMING_Initialize ();
+            if (IsThemeActive())
+                /* subclass user32 controls */
+                THEMING_Initialize ();
             break;
 
 	case DLL_PROCESS_DETACH:


More information about the wine-patches mailing list