Changeset 2834 for trunk/src/user32/win32wbasenonclient.cpp

Timestamp:

Feb 20, 2000, 7:28:35 PM (26 years ago)

Author:

cbratschi

Message:

WM_EX_CONTEXTHELP

File:

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

trunk/src/user32/win32wbasenonclient.cpp

@@ -1 @@
-/* $Id: win32wbasenonclient.cpp,v 1.11 2000-02-16 14:28:23 sandervl Exp $ */
+/* $Id: win32wbasenonclient.cpp,v 1.12 2000-02-20 18:28:35 cbratschi Exp $ */
 /*
  * Win32 Window Base Class for OS/2 (non-client methods)
@@ -39 +39 @@
 #include <menu.h>
 
-#define DBG_LOCALLOG    DBG_win32wbasenonclient
+#define DBG_LOCALLOG    DBG_win32wbasenonclient
 #include "dbglocal.h"
 
@@ -49 +49 @@
 #define KEYDATA_PREVSTATE   0x4000
 
-static HBITMAP hbitmapClose = 0;
-static HBITMAP hbitmapCloseD = 0;
-static HBITMAP hbitmapMinimize = 0;
+static INT bitmapW = 16,bitmapH = 14; //CB: todo: use these values
+static HBITMAP hbitmapClose     = 0;
+static HBITMAP hbitmapCloseD    = 0;
+static HBITMAP hbitmapMinimize  = 0;
 static HBITMAP hbitmapMinimizeD = 0;
-static HBITMAP hbitmapMaximize = 0;
+static HBITMAP hbitmapMaximize  = 0;
 static HBITMAP hbitmapMaximizeD = 0;
-static HBITMAP hbitmapRestore = 0;
-static HBITMAP hbitmapRestoreD = 0;
+static HBITMAP hbitmapRestore   = 0;
+static HBITMAP hbitmapRestoreD  = 0;
+static HBITMAP hbitmapHelp      = 0;
+static HBITMAP hbitmapHelpD     = 0;
 
 BYTE lpGrayMask[] = { 0xAA, 0xA0,
@@ -606 +609 @@
 
   /* Draw frame */
-  PatBlt(hdc,rect->left,   rect->top,      rect->right-rect->left, height,PATCOPY);
-  PatBlt(hdc,rect->left,   rect->top,      width,                  rect->bottom-rect->top,PATCOPY);
-  PatBlt(hdc,rect->left,   rect->bottom-1, rect->right-rect->left,-height,PATCOPY);
-  PatBlt(hdc,rect->right-1,rect->top,     -width,                  rect->bottom-rect->top,PATCOPY);
+  PatBlt(hdc,rect->left,   rect->top,      rect->right-rect->left, height,PATCOPY); //top
+  PatBlt(hdc,rect->left,   rect->top,      width,                  rect->bottom-rect->top,PATCOPY); //left
+  PatBlt(hdc,rect->left,   rect->bottom-1, rect->right-rect->left,-height,PATCOPY); //bottom
+  PatBlt(hdc,rect->right-1,rect->top,     -width,                  rect->bottom-rect->top,PATCOPY); //right
   SelectObject(hdc,oldBrush);
 
@@ -729 +732 @@
           (down ? hbitmapRestoreD : hbitmapRestore ) :
           (down ? hbitmapMaximizeD: hbitmapMaximize);
-  hOldBmp=SelectObject( hdcMem, hBmp );
+  hOldBmp = SelectObject( hdcMem, hBmp );
   GetObjectA (hBmp, sizeof(BITMAP), &bmp);
 
@@ -885 +888 @@
     hbitmapRestore   = LoadBitmapA(0,MAKEINTRESOURCEA(OBM_RESTORE));
     hbitmapRestoreD  = LoadBitmapA(0,MAKEINTRESOURCEA(OBM_RESTORED));
+    hbitmapHelp      = LoadBitmapA(0,MAKEINTRESOURCEA(OBM_HELP));
+    hbitmapHelpD     = LoadBitmapA(0,MAKEINTRESOURCEA(OBM_HELPD));
   }
 
@@ -892 +897 @@
       r.left += GetSystemMetrics(SM_CYCAPTION) - 1;
   }
-
-  //CB: todo: integrate help button
 
   if (dwStyle & WS_SYSMENU)
@@ -905 +908 @@
     DrawCloseButton(memDC,&r2,FALSE,
                     ((((state & MF_DISABLED) || (state & MF_GRAYED))) && (state != 0xFFFFFFFF)));
-    r.right -= GetSystemMetrics(SM_CYCAPTION) - 1;
+    r.right -= GetSystemMetrics(SM_CYCAPTION)-1;
+
+    if (dwExStyle & WS_EX_CONTEXTHELP)
+    {
+#if 0      //CB: todo: integrate help button
+      DrawHelpButton(memDC,&r2,FALSE);
+      r.right -= bitmapW;
+#endif
+    }
 
     if ((dwStyle & WS_MAXIMIZEBOX) || (dwStyle & WS_MINIMIZEBOX))