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

Timestamp:

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

Author:

cbratschi

Message:

resource and other fixes

File:

• trunk/src/user32/scroll.cpp (modified) (3 diffs)

trunk/src/user32/scroll.cpp

@@ -1 @@
-/* $Id: scroll.cpp,v 1.5 1999-10-07 09:28:01 sandervl Exp $ */
+/* $Id: scroll.cpp,v 1.6 1999-10-08 12:10:27 cbratschi Exp $ */
 /*
  * Scrollbar control
@@ -109 +109 @@
 static void SCROLL_LoadBitmaps(void)
 {
-    hUpArrow  = LoadBitmapA( 0, MAKEINTRESOURCEA(OBM_UPARROW) );
-    hDnArrow  = LoadBitmapA( 0, MAKEINTRESOURCEA(OBM_DNARROW) );
-    hLfArrow  = LoadBitmapA( 0, MAKEINTRESOURCEA(OBM_LFARROW) );
-    hRgArrow  = LoadBitmapA( 0, MAKEINTRESOURCEA(OBM_RGARROW) );
-    hUpArrowD = LoadBitmapA( 0, MAKEINTRESOURCEA(OBM_UPARROWD) );
-    hDnArrowD = LoadBitmapA( 0, MAKEINTRESOURCEA(OBM_DNARROWD) );
-    hLfArrowD = LoadBitmapA( 0, MAKEINTRESOURCEA(OBM_LFARROWD) );
-    hRgArrowD = LoadBitmapA( 0, MAKEINTRESOURCEA(OBM_RGARROWD) );
-    hUpArrowI = LoadBitmapA( 0, MAKEINTRESOURCEA(OBM_UPARROWI) );
-    hDnArrowI = LoadBitmapA( 0, MAKEINTRESOURCEA(OBM_DNARROWI) );
-    hLfArrowI = LoadBitmapA( 0, MAKEINTRESOURCEA(OBM_LFARROWI) );
-    hRgArrowI = LoadBitmapA( 0, MAKEINTRESOURCEA(OBM_RGARROWI) );
+    HINSTANCE hinst;
+
+    //CB: Open32 hack to load our own bitmap
+    hinst = LoadLibraryA("USER32.DLL");
+    hUpArrow  = NativeLoadBitmap( hinst, MAKEINTRESOURCEA(OBM_UPARROW) );
+    hDnArrow  = NativeLoadBitmap( hinst, MAKEINTRESOURCEA(OBM_DNARROW) );
+    hLfArrow  = NativeLoadBitmap( hinst, MAKEINTRESOURCEA(OBM_LFARROW) );
+    hRgArrow  = NativeLoadBitmap( hinst, MAKEINTRESOURCEA(OBM_RGARROW) );
+    hUpArrowD = NativeLoadBitmap( hinst, MAKEINTRESOURCEA(OBM_UPARROWD) );
+    hDnArrowD = NativeLoadBitmap( hinst, MAKEINTRESOURCEA(OBM_DNARROWD) );
+    hLfArrowD = NativeLoadBitmap( hinst, MAKEINTRESOURCEA(OBM_LFARROWD) );
+    hRgArrowD = NativeLoadBitmap( hinst, MAKEINTRESOURCEA(OBM_RGARROWD) );
+    hUpArrowI = NativeLoadBitmap( hinst, MAKEINTRESOURCEA(OBM_UPARROWI) );
+    hDnArrowI = NativeLoadBitmap( hinst, MAKEINTRESOURCEA(OBM_DNARROWI) );
+    hLfArrowI = NativeLoadBitmap( hinst, MAKEINTRESOURCEA(OBM_LFARROWI) );
+    hRgArrowI = NativeLoadBitmap( hinst, MAKEINTRESOURCEA(OBM_RGARROWI) );
+    FreeLibrary(hinst);
 }
 
@@ -1554 +1559 @@
 
         if(nBar == SB_HORZ || nBar == SB_BOTH)
-            rc = OSLibWinShowScrollBar(window->getOS2FrameWindowHandle(), 
-                                       window->getHorzScrollHandle(), 
+            rc = OSLibWinShowScrollBar(window->getOS2FrameWindowHandle(),
+                                       window->getHorzScrollHandle(),
                                        OSLIB_HSCROLL, fShow);
 
         if(nBar == SB_VERT || ( rc == TRUE && nBar == SB_BOTH))
             rc = OSLibWinShowScrollBar(window->getOS2FrameWindowHandle(),
-                                       window->getVertScrollHandle(), 
+                                       window->getVertScrollHandle(),
                                        OSLIB_VSCROLL, fShow);