ICCCM says that the TIMESTAMP atom is required, so provide it. This is patch 1424755...

[wxWidgets.git] / src / os2 / bmpbuttn.cpp

diff --git a/src/os2/bmpbuttn.cpp b/src/os2/bmpbuttn.cpp
index 3118216b059ece9bdd64e467fcb065fc1ead2b2f..ed319ad85a0fbf4e0e0530ad69bb75c14899812d 100644 (file)
--- a/src/os2/bmpbuttn.cpp
+++ b/src/os2/bmpbuttn.cpp
@@ -25,18 +25,14 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
 
 #define BUTTON_HEIGHT_FACTOR (EDIT_CONTROL_FACTOR * 1.1)
 
-bool wxBitmapButton::Create(
-  wxWindow*                         pParent
-, wxWindowID                        vId
-, const wxBitmap&                   rBitmap
-, const wxPoint&                    rPos
-, const wxSize&                     rSize
-, long                              lStyle
-#if wxUSE_VALIDATORS
-, const wxValidator&                rValidator
-#endif
-, const wxString&                   rsName
-)
+bool wxBitmapButton::Create( wxWindow*          pParent,
+                             wxWindowID         vId,
+                             const wxBitmap&    rBitmap,
+                             const wxPoint&     rPos,
+                             const wxSize&      rSize,
+                             long               lStyle,
+                             const wxValidator& rValidator,
+                             const wxString&    rsName )
 {
     m_bmpNormal = rBitmap;
     SetName(rsName);
@@ -67,10 +63,10 @@ bool wxBitmapButton::Create(
         m_windowId = vId;
 
     if (nWidth == -1 && rBitmap.Ok())
-        nWidth = rBitmap.GetWidth() + 2 * m_marginX;
+        nWidth = rBitmap.GetWidth() + 4 * m_marginX;
 
     if (nHeight == -1 && rBitmap.Ok())
-        nHeight = rBitmap.GetHeight() + 2 * m_marginY;
+        nHeight = rBitmap.GetHeight() + 4 * m_marginY;
 
     ULONG                           ulOS2Style = WS_VISIBLE | WS_TABSTOP | BS_USERBUTTON;
 
@@ -79,7 +75,7 @@ bool wxBitmapButton::Create(
 
     m_hWnd = (WXHWND)::WinCreateWindow( GetHwndOf(pParent)
                                        ,WC_BUTTON
-                                       ,wxT("")
+                                       ,(PSZ)wxEmptyString
                                        ,ulOS2Style
                                        ,0, 0, 0, 0
                                        ,GetHwndOf(pParent)
@@ -99,12 +95,10 @@ bool wxBitmapButton::Create(
             ,nWidth
             ,nHeight
            );
-    return TRUE;
+    return true;
 } // end of wxBitmapButton::Create
 
-bool wxBitmapButton::OS2OnDraw(
-  WXDRAWITEMSTRUCT*                 pItem
-)
+bool wxBitmapButton::OS2OnDraw( WXDRAWITEMSTRUCT* pItem)
 {
     PUSERBUTTON                     pUser     = (PUSERBUTTON)pItem;
     bool                            bAutoDraw = (GetWindowStyleFlag() & wxBU_AUTODRAW) != 0;
@@ -113,7 +107,6 @@ bool wxBitmapButton::OS2OnDraw(
         return FALSE;
 
     wxBitmap*                       pBitmap;
-    RECTL                           vRect;
     bool                            bIsSelected = pUser->fsState & BDS_HILITED;
     wxClientDC                      vDc(this);
 
@@ -134,7 +127,6 @@ bool wxBitmapButton::OS2OnDraw(
     // Centre the bitmap in the control area
     //
     int                             nX         = 0;
-    int                             nY         = 0;
     int                             nX1        = 0;
     int                             nY1        = 0;
     int                             nWidth     = vDc.m_vRclPaint.xRight - vDc.m_vRclPaint.xLeft;
@@ -163,11 +155,7 @@ bool wxBitmapButton::OS2OnDraw(
     //
     // Draw the bitmap
     //
-    vDc.DrawBitmap( *pBitmap
-                   ,nX1
-                   ,nY1
-                   ,TRUE
-                  );
+    vDc.DrawBitmap( *pBitmap, nX1, nY1, true );
 
     //
     // Draw focus / disabled state, if auto-drawing
@@ -182,22 +170,18 @@ bool wxBitmapButton::OS2OnDraw(
     {
         DrawButtonFocus(vDc);
     }
-    return TRUE;
+    return true;
 } // end of wxBitmapButton::OS2OnDraw
 
-void wxBitmapButton::DrawFace (
-  wxClientDC&                       rDC
-, bool                              bSel
-)
+void wxBitmapButton::DrawFace (wxClientDC& rDC, bool bSel)
 {
     //
     // Set up drawing colors
     //
-    wxPen                           vHiLitePen(wxColour(255, 255, 255), 1, wxSOLID); // White
-    wxPen                           vLitePen(wxColour(223, 223, 223), 1, wxSOLID); // Very Light Grey
-    wxPen                           vShadowPen(wxColour(191, 191, 191), 1, wxSOLID); // Medium Grey
-    wxPen                           vDarkShadowPen(wxColour(128, 128, 128), 1, wxSOLID);
-    wxColour                        vFaceColor(wxColour(204, 204, 204)); // Light Grey
+    wxPen vHiLitePen(*wxWHITE, 2, wxSOLID); // White
+    wxColour gray85(85, 85, 85);
+    wxPen vDarkShadowPen(gray85, 2, wxSOLID);
+    wxColour vFaceColor(204, 204, 204); // Light Grey
 
     //
     // Draw the main button face
@@ -208,59 +192,36 @@ void wxBitmapButton::DrawFace (
     // Draw the border
     //
     rDC.SetPen(bSel ? vDarkShadowPen : vHiLitePen);
-    rDC.DrawLine( rDC.m_vRclPaint.xLeft
-                 ,rDC.m_vRclPaint.yTop
-                 ,rDC.m_vRclPaint.xRight - 1
-                 ,rDC.m_vRclPaint.yTop
-                );
-    rDC.DrawLine( rDC.m_vRclPaint.xLeft
-                 ,rDC.m_vRclPaint.yTop + 1
-                 ,rDC.m_vRclPaint.xLeft
-                 ,rDC.m_vRclPaint.yBottom - 1
-                );
-
-    rDC.SetPen(bSel ? vShadowPen : vLitePen);
     rDC.DrawLine( rDC.m_vRclPaint.xLeft + 1
-                 ,rDC.m_vRclPaint.yTop + 1
-                 ,rDC.m_vRclPaint.xRight - 2
-                 ,rDC.m_vRclPaint.yTop + 1
+                 ,rDC.m_vRclPaint.yTop - 1
+                 ,rDC.m_vRclPaint.xRight - 1
+                 ,rDC.m_vRclPaint.yTop - 1
                 );
     rDC.DrawLine( rDC.m_vRclPaint.xLeft + 1
-                 ,rDC.m_vRclPaint.yTop + 2
+                 ,rDC.m_vRclPaint.yTop - 1
                  ,rDC.m_vRclPaint.xLeft + 1
-                 ,rDC.m_vRclPaint.yBottom - 2
+                 ,rDC.m_vRclPaint.yBottom + 1
                 );
 
-    rDC.SetPen(bSel ? vLitePen : vShadowPen);
+    rDC.SetPen(bSel ? vHiLitePen : vDarkShadowPen);
     rDC.DrawLine( rDC.m_vRclPaint.xLeft + 1
-                 ,rDC.m_vRclPaint.yBottom - 2
+                 ,rDC.m_vRclPaint.yBottom + 1
                  ,rDC.m_vRclPaint.xRight - 1
-                 ,rDC.m_vRclPaint.yBottom - 2
-                );
-    rDC.DrawLine( rDC.m_vRclPaint.xRight - 2
-                 ,rDC.m_vRclPaint.yBottom - 3
-                 ,rDC.m_vRclPaint.xRight - 2
-                 ,rDC.m_vRclPaint.yTop
-                );
-
-    rDC.SetPen(bSel ? vDarkShadowPen : vHiLitePen);
-    rDC.DrawLine( rDC.m_vRclPaint.xLeft
-                 ,rDC.m_vRclPaint.yBottom - 1
-                 ,rDC.m_vRclPaint.xRight + 2
-                 ,rDC.m_vRclPaint.yBottom - 1
+                 ,rDC.m_vRclPaint.yBottom + 1
                 );
     rDC.DrawLine( rDC.m_vRclPaint.xRight - 1
-                 ,rDC.m_vRclPaint.yBottom - 2
-                 ,rDC.m_vRclPaint.xRight - 1
                  ,rDC.m_vRclPaint.yTop - 1
+                 ,rDC.m_vRclPaint.xRight - 1
+                 ,rDC.m_vRclPaint.yBottom + 1
                 );
+
 } // end of wxBitmapButton::DrawFace
 
 void wxBitmapButton::DrawButtonFocus (
   wxClientDC&                       rDC
 )
 {
-    wxPen                           vBlackPen(wxColour(0, 0, 0), 2, wxSOLID);
+    wxPen vBlackPen(*wxBLACK, 2, wxSOLID);
 
     //
     // Draw a thick black line around the outside of the button
@@ -288,12 +249,10 @@ void wxBitmapButton::DrawButtonFocus (
                 );
 } // end of wxBitmapButton::DrawButtonFocus
 
-void wxBitmapButton::DrawButtonDisable(
-  wxClientDC&                       rDC
-, wxBitmap&                         rBmp
-)
+void wxBitmapButton::DrawButtonDisable( wxClientDC& rDC,
+                                        wxBitmap& rBmp )
 {
-    wxPen                           vGreyPen(wxColour(128, 128, 128), 2, wxSOLID);
+    wxPen vGreyPen(wxT("GREY"), 2, wxSOLID);
 
     //
     // Draw a thick black line around the outside of the button
@@ -328,4 +287,3 @@ void wxBitmapButton::SetDefault()
 }
 
 #endif // ndef for wxUSE_BMPBUTTON
-