Unicode fixes

[wxWidgets.git] / src / msw / button.cpp

diff --git a/src/msw/button.cpp b/src/msw/button.cpp
index 5c30bf807b52df929c0bfecac15f0bb834326850..a7df197b6c67f450d83bb11d7e2f4981ddf48300 100644 (file)
--- a/src/msw/button.cpp
+++ b/src/msw/button.cpp
@@ -305,7 +305,7 @@ static void DrawRect(HDC hdc, const RECT& r)
 void wxButton::MakeOwnerDrawn()
 {
     long style = GetWindowLong(GetHwnd(), GWL_STYLE);
-    if ( !(style & BS_OWNERDRAW) )
+    if ( (style & BS_OWNERDRAW) != BS_OWNERDRAW )
     {
         // make it so
         style |= BS_OWNERDRAW;
@@ -475,6 +475,12 @@ bool wxButton::MSWOnDraw(WXDRAWITEMSTRUCT *wxdis)
         DrawFocusRect(hdc, &rectFocus);
     }
 
+    if ( pushed )
+    {
+        // the label is shifted by 1 pixel to create "pushed" effect
+        OffsetRect(&rectBtn, 1, 1);
+    }
+
     DrawButtonText(hdc, &rectBtn, GetLabel(),
                    state & ODS_DISABLED ? GetSysColor(COLOR_GRAYTEXT)
                                         : colFg);