Changeset 1425 for trunk/src/user32/button.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)
• button.cpp (modified) (3 diffs)

trunk/src/user32/button.cpp

@@ -1 @@
-/* $Id: button.cpp,v 1.13 1999-10-20 06:38:08 sandervl Exp $ */
+/* $Id: button.cpp,v 1.14 1999-10-23 23:04:32 sandervl Exp $ */
 /* File: button.cpp -- Button type widgets
  *
@@ -17 +17 @@
 #include "button.h"
 #include <misc.h>
+#include "initterm.h"
 
 //Prototypes
@@ -128 +129 @@
   {
     BITMAP bmp;
-    HINSTANCE hinst;
-
-    //CB: Open32 hack to load our own bitmap
-    hinst = LoadLibraryA("USER32.DLL");
-    hbitmapCheckBoxes = NativeLoadBitmap(hinst,MAKEINTRESOURCEA(OBM_CHECKBOXES));
-    FreeLibrary(hinst);
+
+    hbitmapCheckBoxes = LoadBitmapA(hInstanceUser32, MAKEINTRESOURCEA(OBM_CHECKBOXES));
+    GetObjectA( hbitmapCheckBoxes, sizeof(bmp), &bmp );
     if (GetObjectA(hbitmapCheckBoxes,sizeof(bmp),&bmp))
     {