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

Timestamp:

Oct 24, 1999, 1:05:05 AM (26 years ago)

Author:

sandervl

Message:

Combobox + windowpos changes + fixes

Location:

trunk/src/user32

Files:

• . (modified) (1 prop)
• combo.cpp (modified) (5 diffs)

trunk/src/user32/combo.cpp

@@ -1 @@
-/* $Id: combo.cpp,v 1.8 1999-10-21 12:19:26 sandervl Exp $ */
+/* $Id: combo.cpp,v 1.9 1999-10-23 23:04:33 sandervl Exp $ */
 /*
  * Combo controls
@@ -15 +15 @@
 #include "controls.h"
 #include "combo.h"
+#include "initterm.h"
 
   /* bits in the dwKeyData */
@@ -60 +61 @@
   {
     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);
+
+//SvL: Combo bitmap is invalid
+    hComboBmp = LoadBitmapA(0, MAKEINTRESOURCEA(OBM_COMBO));
+//    hComboBmp = LoadBitmapA(hInstanceUser32, MAKEINTRESOURCEA(OBM_COMBO));
     if(hComboBmp)
     {
@@ -165 +164 @@
 {
   RECT windowRect;
-
-  //SvL: Doesn't work for us
-  return;
 
   GetWindowRect(CB_HWND(lphc), &windowRect);
@@ -1721 +1717 @@
        }
        ReleaseCapture();
-       SetCapture(lphc->hWndLBox);
+//SvL: Don't set the capture here. Otherwise other controls don't respond the first time!
+//       SetCapture(lphc->hWndLBox);
    }