Added support for bitmap buttons with standard Win95/98 LNF if __WIN95__ is #defined

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6308 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/msw/bmpbuttn.cpp

@@ -244,33 +244,86 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
     return TRUE;
 }
 
+// GRG Feb/2000, support for bmp buttons with Win95/98 standard LNF
+
+#if defined(__WIN95__)
+
 void wxBitmapButton::DrawFace( WXHDC dc, int left, int top, int right, int bottom, bool sel )
 {
     HPEN oldp;
-    HBRUSH oldb ;
+    HPEN penHiLight;
+    HPEN penLight;
+    HPEN penShadow;
+    HPEN penDkShadow;
+    HBRUSH brushFace;
 
+    // create needed pens and brush
+    penHiLight  = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_3DHILIGHT));
+    penLight    = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_3DLIGHT));
+    penShadow   = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_3DSHADOW));
+    penDkShadow = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_3DDKSHADOW));
+    brushFace   = CreateSolidBrush(GetSysColor(COLOR_BTNFACE));
+
+    // draw the rectangle
+    RECT rect;
+    rect.left   = left;
+    rect.right  = right;
+    rect.top    = top;
+    rect.bottom = bottom;
+    FillRect((HDC) dc, &rect, brushFace);
+
+    // draw the border
+    oldp = (HPEN) SelectObject( (HDC) dc, sel? penDkShadow : penHiLight);
+    MoveToEx((HDC) dc, left, top, NULL); LineTo((HDC) dc, right-1, top);
+    MoveToEx((HDC) dc, left, top+1, NULL); LineTo((HDC) dc, left, bottom-1);
+
+    SelectObject( (HDC) dc, sel? penShadow : penLight);
+    MoveToEx((HDC) dc, left+1, top+1, NULL); LineTo((HDC) dc, right-2, top+1);
+    MoveToEx((HDC) dc, left+1, top+2, NULL); LineTo((HDC) dc, left+1, bottom-2);
+
+    SelectObject( (HDC) dc, sel? penLight : penShadow);
+    MoveToEx((HDC) dc, left+1, bottom-2, NULL); LineTo((HDC) dc, right-1, bottom-2);
+    MoveToEx((HDC) dc, right-2, bottom-3, NULL); LineTo((HDC) dc, right-2, top);
+
+    SelectObject( (HDC) dc, sel? penHiLight : penDkShadow);
+    MoveToEx((HDC) dc, left, bottom-1, NULL); LineTo((HDC) dc, right+2, bottom-1);
+    MoveToEx((HDC) dc, right-1, bottom-2, NULL); LineTo((HDC) dc, right-1, top-1);
+
+    // delete allocated resources
+    SelectObject((HDC) dc,oldp);
+    DeleteObject(penHiLight);
+    DeleteObject(penLight);
+    DeleteObject(penShadow);
+    DeleteObject(penDkShadow);
+    DeleteObject(brushFace);
+}
+
+#else
+
+void wxBitmapButton::DrawFace( WXHDC dc, int left, int top, int right, int bottom, bool sel )
+{
+    HPEN oldp;
     HPEN penBorder;
     HPEN penLight;
     HPEN penShadow;
     HBRUSH brushFace;
-    COLORREF ms_color;
 
-    ms_color = GetSysColor(COLOR_WINDOWFRAME) ;
+    // create needed pens and brush
-    penBorder = CreatePen(PS_SOLID,0,ms_color) ;
+    penBorder = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_WINDOWFRAME));
+    penShadow = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_BTNSHADOW));
+    penLight  = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_BTNHIGHLIGHT));
+    brushFace = CreateSolidBrush(COLOR_BTNFACE);
 
-    ms_color = GetSysColor(COLOR_BTNSHADOW) ;
+    // draw the rectangle
-    penShadow = CreatePen(PS_SOLID,0,ms_color) ;
+    RECT rect;
+    rect.left   = left;
+    rect.right  = right;
+    rect.top    = top;
+    rect.bottom = bottom;
+    FillRect((HDC) dc, &rect, brushFace);
 
-    ms_color = GetSysColor(COLOR_BTNHIGHLIGHT) ;
+    // draw the border
-    penLight = CreatePen(PS_SOLID,0,ms_color) ;
+    oldp = (HPEN) SelectObject( (HDC) dc, penBorder);
-
-    ms_color = GetSysColor(COLOR_BTNFACE) ;
-    brushFace = CreateSolidBrush(ms_color) ;
-
-    oldp = (HPEN) SelectObject( (HDC) dc, GetStockObject( NULL_PEN ) ) ;
-    oldb = (HBRUSH) SelectObject( (HDC) dc, brushFace ) ;
-    Rectangle( (HDC) dc, left, top, right, bottom ) ;
-    SelectObject( (HDC) dc, penBorder) ;
     MoveToEx((HDC) dc,left+1,top,NULL);LineTo((HDC) dc,right-1,top);
     MoveToEx((HDC) dc,left,top+1,NULL);LineTo((HDC) dc,left,bottom-1);
     MoveToEx((HDC) dc,left+1,bottom-1,NULL);LineTo((HDC) dc,right-1,bottom-1);
@@ -288,6 +341,7 @@ void wxBitmapButton::DrawFace( WXHDC dc, int left, int top, int right, int botto
         MoveToEx((HDC) dc,left+1    ,bottom-2   ,NULL);
         LineTo((HDC) dc,  right-2   ,bottom-2);
         LineTo((HDC) dc,  right-2   ,top);
+
         MoveToEx((HDC) dc,left+2    ,bottom-3   ,NULL);
         LineTo((HDC) dc,  right-3   ,bottom-3);
         LineTo((HDC) dc,  right-3   ,top+1);
@@ -298,15 +352,18 @@ void wxBitmapButton::DrawFace( WXHDC dc, int left, int top, int right, int botto
         LineTo((HDC) dc,  left+1    ,top+1);
         LineTo((HDC) dc,  right-2   ,top+1);
     }
-    SelectObject((HDC) dc,oldp) ;
-    SelectObject((HDC) dc,oldb) ;
 
+    // delete allocated resources
+    SelectObject((HDC) dc,oldp);
     DeleteObject(penBorder);
     DeleteObject(penLight);
     DeleteObject(penShadow);
     DeleteObject(brushFace);
 }
 
+#endif // defined(__WIN95__)
+
+
 // VZ: should be at the very least less than wxDEFAULT_BUTTON_MARGIN
 #define FOCUS_MARGIN 3
 
@@ -318,8 +375,12 @@ void wxBitmapButton::DrawButtonFocus( WXHDC dc, int left, int top, int right, in
     rect.right = right;
     rect.bottom = bottom;
     InflateRect( &rect, - FOCUS_MARGIN, - FOCUS_MARGIN );
+
+    // GRG: the focus rectangle should not move when the button is pushed!
+/*
     if ( sel )
         OffsetRect( &rect, 1, 1 );
+*/
     DrawFocusRect( (HDC) dc, &rect );
 }