Changeset 1184 for trunk/src/user32/combo.cpp

Timestamp:

Oct 8, 1999, 2:10:27 PM (26 years ago)

Author:

cbratschi

Message:

resource and other fixes

File:

• trunk/src/user32/combo.cpp (modified) (5 diffs)

trunk/src/user32/combo.cpp

@@ -1 @@
-/* $Id: combo.cpp,v 1.2 1999-10-01 10:15:22 sandervl Exp $ */
+/* $Id: combo.cpp,v 1.3 1999-10-08 12:10:26 cbratschi Exp $ */
 /*
  * Combo controls
@@ -58 +58 @@
   if(hDC)
   {
-    BOOL        bRet = FALSE;
+    BOOL      bRet = FALSE;
+    HINSTANCE hinst;
+
+    //CB: Open32 hack to load our own bitmap
+    hinst = LoadLibraryA("USER32.DLL");
     hComboBmp = NativeLoadBitmap(0,MAKEINTRESOURCEA(OBM_COMBO));
+    FreeLibrary(hinst);
     if(hComboBmp)
     {
@@ -532 +537 @@
         lbeStyle |= LBS_DISABLENOSCROLL;
 
-      if( CB_GETTYPE(lphc) == CBS_SIMPLE )      /* child listbox */
+      if( CB_GETTYPE(lphc) == CBS_SIMPLE )      /* child listbox */
       {
-        lbeStyle |= WS_CHILD | WS_VISIBLE;
-
-        /*
-         * In win 95 look n feel, the listbox in the simple combobox has
-         * the WS_EXCLIENTEDGE style instead of the WS_BORDER style.
-         */
+        lbeStyle |= WS_CHILD | WS_VISIBLE;
+
+        /*
+         * In win 95 look n feel, the listbox in the simple combobox has
+         * the WS_EXCLIENTEDGE style instead of the WS_BORDER style.
+         */
         lbeStyle   &= ~WS_BORDER;
         lbeExStyle |= WS_EX_CLIENTEDGE;
       }
-      else                                      /* popup listbox */
-        lbeStyle |= WS_POPUP;
+      else                                      /* popup listbox */
+        lbeStyle |= WS_POPUP;
 
      /* Dropdown ComboLBox is not a child window and we cannot pass
@@ -1132 +1137 @@
 
    SetWindowPos( lphc->hWndLBox, HWND_TOP, rect.left, rect.bottom,
-                 lphc->droppedRect.right - lphc->droppedRect.left,
+                 lphc->droppedRect.right - lphc->droppedRect.left,
                  nDroppedHeight,
-                 SWP_NOACTIVATE | SWP_NOREDRAW);
+                 SWP_NOACTIVATE | SWP_NOREDRAW);
 
 
@@ -1164 +1169 @@
            RECT rect;
 
-           /*
-            * It seems useful to send the WM_LBUTTONUP with (-1,-1) when cancelling
-            * and with (0,0) (anywhere in the listbox) when Oking.
-            */
-           SendMessageA( lphc->hWndLBox, WM_LBUTTONUP, 0, ok ? (LPARAM)0 : (LPARAM)(-1) );
+           /*
+            * It seems useful to send the WM_LBUTTONUP with (-1,-1) when cancelling
+            * and with (0,0) (anywhere in the listbox) when Oking.
+            */
+           SendMessageA( lphc->hWndLBox, WM_LBUTTONUP, 0, ok ? (LPARAM)0 : (LPARAM)(-1) );
 
            lphc->wState &= ~CBF_DROPPED;