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

Timestamp:

Aug 15, 1999, 9:12:50 PM (26 years ago)

Author:

cbratschi

Message:

internal toolbar bitmaps

File:

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

trunk/src/comctl32/toolbar.c

@@ -1 @@
-/* $Id: toolbar.c,v 1.12 1999-08-14 16:13:13 cbratschi Exp $ */
+/* $Id: toolbar.c,v 1.13 1999-08-15 19:12:50 cbratschi Exp $ */
 /*
  * Toolbar control
@@ -30 +30 @@
   - IMAGELIST_Draw draws a line too at the bottom of the bitmap (toolbar.exe)
     imagelist uses default size values instead of real bitmap values
+  - LoadBitmapA -> use NativeLoadBitmap, is OS/2 bitmap resource
 */
 
@@ -135 +136 @@
 
     if (!himl)
-        return;
+        return;
 
     /* create new dc's */
@@ -1659 +1660 @@
     else if (lpAddBmp->hInst == HINST_COMMCTRL)
     {
-        /* Add system bitmaps */
-        switch (lpAddBmp->nID)
+        /* 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;
-        }
+            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
     {
-        hbmLoad = LoadBitmapA (lpAddBmp->hInst, (LPSTR)lpAddBmp->nID);
-        nIndex = ImageList_AddMasked (infoPtr->himlDef, hbmLoad, CLR_DEFAULT);
-        DeleteObject (hbmLoad);
+        hbmLoad = LoadBitmapA (lpAddBmp->hInst, (LPSTR)lpAddBmp->nID);
+        nIndex = ImageList_AddMasked (infoPtr->himlDef, hbmLoad, CLR_DEFAULT);
+        DeleteObject (hbmLoad);
     }