toolbar - get rid of direct ImageList access hacks

Vitaliy Margolen wine-patch at kievinfo.com
Tue May 13 10:14:48 CDT 2003


Looks like resizing ToolBar buttons doesn't work this way. Needs more work.
For a time being revert this change:

Vitaliy Margolen
 changelog:
   - dlls/comctrl32/toolbar.c
     revert change for resizing buttons


     
Index: dlls/comctl32/toolbar.c
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/toolbar.c,v
retrieving revision 1.131
diff -u -r1.131 toolbar.c
--- dlls/comctl32/toolbar.c     13 May 2003 03:36:54 -0000      1.131
+++ dlls/comctl32/toolbar.c     13 May 2003 06:03:24 -0000
@@ -29,7 +29,6 @@
  *
  *
  * TODO:
- *   - A little bug in TOOLBAR_DrawMasked()
  *   - Button wrapping (under construction).
  *   - Messages.
  *   - Notifications (under construction).
@@ -67,6 +66,7 @@
 #include "winuser.h"
 #include "wine/unicode.h"
 #include "commctrl.h"
+#include "imagelist.h"
 #include "comctl32.h"
 #include "wine/debug.h"
 
@@ -3952,8 +3952,12 @@
     infoPtr->nBitmapWidth = (INT)LOWORD(lParam);
     infoPtr->nBitmapHeight = (INT)HIWORD(lParam);
 
-    if (himlDef)
-        ImageList_SetIconSize(himlDef, infoPtr->nBitmapWidth, infoPtr->nBitmapHeight);
+
+    /* uses image list internals directly */
+    if (himlDef) {
+        himlDef->cx = infoPtr->nBitmapWidth;
+        himlDef->cy = infoPtr->nBitmapHeight;
+    }
 
     return TRUE;
 }




More information about the wine-patches mailing list