Changeset 496 for trunk/src/comctl32/toolbar.c

Timestamp:

Aug 14, 1999, 6:13:16 PM (26 years ago)

Author:

cbratschi

Message:

wine-990731 update

File:

• trunk/src/comctl32/toolbar.c (modified) (10 diffs)

trunk/src/comctl32/toolbar.c

@@ -1 @@
-/* $Id: toolbar.c,v 1.11 1999-07-12 15:58:49 cbratschi Exp $ */
+/* $Id: toolbar.c,v 1.12 1999-08-14 16:13:13 cbratschi Exp $ */
 /*
  * Toolbar control
@@ -14 +14 @@
  *   - Fix TB_SETROWS.
  *   - Tooltip support (almost complete).
- *   - Internal COMMCTL32 bitmaps.
  *   - Fix TOOLBAR_SetButtonInfo32A.
  *   - Drag & drop of buttons
@@ -45 +44 @@
 #define BOTTOM_BORDER      2
 
-#define TOOLBAR_GetInfoPtr(wndPtr) ((TOOLBAR_INFO *)GetWindowLongA(hwnd,0))
+#define TOOLBAR_GetInfoPtr(hwnd) ((TOOLBAR_INFO *)GetWindowLongA(hwnd,0))
 
 
@@ -130 +129 @@
               internals directly */
 
-    HDC hdcImageList = CreateCompatibleDC (0);
-    HDC hdcMask = CreateCompatibleDC (0);
     HIMAGELIST himl = infoPtr->himlDef;
     HBITMAP hbmMask;
+    HDC hdcImageList;
+    HDC hdcMask;
+
+    if (!himl)
+        return;
+
+    /* create new dc's */
+    hdcImageList = CreateCompatibleDC (0);
+    hdcMask = CreateCompatibleDC (0);
 
     /* create new bitmap */
@@ -179 +185 @@
 
     rc = btnPtr->rect;
+
+    /* separator */
     if (btnPtr->fsStyle & TBSTYLE_SEP)
     {
-      if ((dwStyle & TBSTYLE_FLAT) && (btnPtr->idCommand == 0))
+      if ((dwStyle & TBSTYLE_FLAT) && (btnPtr->iBitmap == 0))
           TOOLBAR_DrawFlatSeparator (&rc, hdc);
       return;
@@ -1544 +1552 @@
  * This function implements the toolbar customization dialog.
  */
-BOOL WINAPI
+static BOOL WINAPI
 TOOLBAR_CustomizeDialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
@@ -1585 +1593 @@
     LPTBADDBITMAP lpAddBmp = (LPTBADDBITMAP)lParam;
     INT nIndex = 0,nButtons;
+    HBITMAP hbmLoad;
 
     if (!lpAddBmp)
@@ -1602 +1611 @@
 //        TRACE ("adding %d internal bitmaps!\n", nButtons);
 
-        /* Windows resize all the buttons to the size of a newly added STandard Image*/
+        /* Windows resize all the buttons to the size of a newly added standard Image*/
         if (lpAddBmp->nID & 1)
         {
@@ -1650 +1659 @@
     else if (lpAddBmp->hInst == HINST_COMMCTRL)
     {
-        /* add internal bitmaps */
-//        FIXME ("internal bitmaps not supported!\n");
-
-        /* Hack to "add" some reserved images within the image list
-           to get the right image indices */
-        nIndex = ImageList_GetImageCount (infoPtr->himlDef);
-        ImageList_SetImageCount (infoPtr->himlDef, nIndex + nButtons);
+        /* Add system bitmaps */
+        switch (lpAddBmp->nID)
+      {
+            case IDB_STD_SMALL_COLOR:
+                hbmLoad = LoadBitmapA (COMCTL32_hModule,
+                                       MAKEINTRESOURCEA(IDB_STD_SMALL));
+                nIndex = ImageList_AddMasked (infoPtr->himlDef,
+                                              hbmLoad, CLR_DEFAULT);
+                DeleteObject (hbmLoad);
+                break;
+
+            case IDB_STD_LARGE_COLOR:
+                hbmLoad = LoadBitmapA (COMCTL32_hModule,
+                                       MAKEINTRESOURCEA(IDB_STD_LARGE));
+                nIndex = ImageList_AddMasked (infoPtr->himlDef,
+                                              hbmLoad, CLR_DEFAULT);
+                DeleteObject (hbmLoad);
+                break;
+
+            case IDB_VIEW_SMALL_COLOR:
+                hbmLoad = LoadBitmapA (COMCTL32_hModule,
+                                       MAKEINTRESOURCEA(IDB_VIEW_SMALL));
+                nIndex = ImageList_AddMasked (infoPtr->himlDef,
+                                              hbmLoad, CLR_DEFAULT);
+                DeleteObject (hbmLoad);
+                break;
+
+            case IDB_VIEW_LARGE_COLOR:
+                hbmLoad = LoadBitmapA (COMCTL32_hModule,
+                                       MAKEINTRESOURCEA(IDB_VIEW_LARGE));
+                nIndex = ImageList_AddMasked (infoPtr->himlDef,
+                                              hbmLoad, CLR_DEFAULT);
+                DeleteObject (hbmLoad);
+                break;
+
+            case IDB_HIST_SMALL_COLOR:
+                hbmLoad = LoadBitmapA (COMCTL32_hModule,
+                                       MAKEINTRESOURCEA(IDB_HIST_SMALL));
+                nIndex = ImageList_AddMasked (infoPtr->himlDef,
+                                              hbmLoad, CLR_DEFAULT);
+                DeleteObject (hbmLoad);
+                break;
+
+            case IDB_HIST_LARGE_COLOR:
+                hbmLoad = LoadBitmapA (COMCTL32_hModule,
+                                       MAKEINTRESOURCEA(IDB_HIST_LARGE));
+                nIndex = ImageList_AddMasked (infoPtr->himlDef,
+                                              hbmLoad, CLR_DEFAULT);
+                DeleteObject (hbmLoad);
+                break;
+
+            default:
+        nIndex = ImageList_GetImageCount (infoPtr->himlDef);
+                //ERR ("invalid imagelist!\n");
+                break;
+        }
     }
     else
     {
-        HBITMAP hBmp =
-            LoadBitmapA (lpAddBmp->hInst, (LPSTR)lpAddBmp->nID);
-        nIndex = ImageList_AddMasked (infoPtr->himlDef, hBmp, CLR_DEFAULT);
-
-        DeleteObject (hBmp);
+        hbmLoad = LoadBitmapA (lpAddBmp->hInst, (LPSTR)lpAddBmp->nID);
+        nIndex = ImageList_AddMasked (infoPtr->himlDef, hbmLoad, CLR_DEFAULT);
+        DeleteObject (hbmLoad);
     }
 
@@ -3825 +3881 @@
 
 
-LRESULT WINAPI
+static LRESULT WINAPI
 ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {