Changeset 2857 for trunk/src/user32/loadres.cpp

Timestamp:

Feb 22, 2000, 6:07:43 PM (26 years ago)

Author:

cbratschi

Message:

WS_EX_CONTEXTHELP, activated some WINE code

File:

• trunk/src/user32/loadres.cpp (modified) (8 diffs)

trunk/src/user32/loadres.cpp

@@ -1 @@
-/* $Id: loadres.cpp,v 1.23 2000-02-16 14:34:21 sandervl Exp $ */
+/* $Id: loadres.cpp,v 1.24 2000-02-22 17:07:40 cbratschi Exp $ */
 
 /*
@@ -29 +29 @@
 #include <win\cursoricon.h>
 
-#define DBG_LOCALLOG    DBG_loadres
+#define DBG_LOCALLOG    DBG_loadres
 #include "dbglocal.h"
 
@@ -255 +255 @@
         case OBM_OLD_LFARROW:
         case OBM_CHECK:
-        case OBM_RADIOCHECK:
+        case OBM_RADIOCHECK:
         case OBM_CHECKBOXES:
         case OBM_BTNCORNERS:
@@ -270 +270 @@
         case OBM_RGARROWI:
         case OBM_LFARROWI:
-        case OBM_CLOSED:
+        case OBM_CLOSED:
         case OBM_OLD_CLOSE:
         case OBM_BTSIZE:
@@ -276 +276 @@
         case OBM_OLD_ZOOM:
         case OBM_OLD_RESTORE:
+        case OBM_CONTEXTHELP:
+        case OBM_CONTEXTHELPD:
                 return TRUE;
 
@@ -361 +363 @@
         }
         else {
-//        if(fix_info->bmiHeader.biBitCount == 1) {
-//              hbitmap = CreateBitmap(fix_info->bmiHeader.biWidth, 
+//        if(fix_info->bmiHeader.biBitCount == 1) {
+//              hbitmap = CreateBitmap(fix_info->bmiHeader.biWidth,
 //                                       fix_info->bmiHeader.biHeight,
-//                                       fix_info->bmiHeader.biPlanes, 
-//                                       fix_info->bmiHeader.biBitCount, 
+//                                       fix_info->bmiHeader.biPlanes,
+//                                       fix_info->bmiHeader.biBitCount,
 //                                       (PVOID)bits);
-//        }
-//        else {
-                hbitmap = CreateDIBitmap(hdc, &fix_info->bmiHeader, CBM_INIT,
+//        }
+//        else {
+                hbitmap = CreateDIBitmap(hdc, &fix_info->bmiHeader, CBM_INIT,
                                          bits, fix_info, DIB_RGB_COLORS );
-//        }
+//        }
         }
         ReleaseDC( 0, hdc );
@@ -384 +386 @@
 //TODO: No support for RT_NEWBITMAP
 //******************************************************************************
-//******************************************************************************
-//TODO: No support for RT_NEWBITMAP
-//******************************************************************************
 HBITMAP WIN32API LoadBitmapA(HINSTANCE hinst, LPCSTR lpszBitmap)
 {
@@ -395 +394 @@
     if(IsSystemBitmap((ULONG)lpszBitmap))
     {
-         hBitmap =  LoadBitmapA(hInstanceUser32, lpszBitmap, 0, 0, 0);
-    } 
-  } 
-  if(!hBitmap) 
-        hBitmap = LoadBitmapA(hinst, lpszBitmap, 0, 0, 0);
+         hBitmap =  LoadBitmapA(hInstanceUser32, lpszBitmap, 0, 0, 0);
+    }
+  }
+  if(!hBitmap)
+        hBitmap = LoadBitmapA(hinst, lpszBitmap, 0, 0, 0);
 
   dprintf(("LoadBitmapA returned %08xh\n", hBitmap));