Some change logs

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

diff --git a/src/os2/bmpbuttn.cpp b/src/os2/bmpbuttn.cpp
index 3118216b059ece9bdd64e467fcb065fc1ead2b2f..af6dae09c1a10959ddb4d609fbc9ced18fdcd3aa 100644 (file)
--- a/src/os2/bmpbuttn.cpp
+++ b/src/os2/bmpbuttn.cpp
@@ -32,9 +32,7 @@ bool wxBitmapButton::Create(
 , const wxPoint&                    rPos
 , const wxSize&                     rSize
 , long                              lStyle
 , const wxPoint&                    rPos
 , const wxSize&                     rSize
 , long                              lStyle

-#if wxUSE_VALIDATORS

 , const wxValidator&                rValidator
 , const wxValidator&                rValidator

-#endif

 , const wxString&                   rsName
 )
 {
 , const wxString&                   rsName
 )
 {


@@ -67,10 +65,10 @@ bool wxBitmapButton::Create(
         m_windowId = vId;
 
     if (nWidth == -1 && rBitmap.Ok())
         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())
 
     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;
 
 
     ULONG                           ulOS2Style = WS_VISIBLE | WS_TABSTOP | BS_USERBUTTON;
 


@@ -79,7 +77,7 @@ bool wxBitmapButton::Create(
 
     m_hWnd = (WXHWND)::WinCreateWindow( GetHwndOf(pParent)
                                        ,WC_BUTTON
 
     m_hWnd = (WXHWND)::WinCreateWindow( GetHwndOf(pParent)
                                        ,WC_BUTTON

-                                       ,wxT("")
+                                       ,(PSZ)wxEmptyString

                                        ,ulOS2Style
                                        ,0, 0, 0, 0
                                        ,GetHwndOf(pParent)
                                        ,ulOS2Style
                                        ,0, 0, 0, 0
                                        ,GetHwndOf(pParent)


@@ -113,7 +111,6 @@ bool wxBitmapButton::OS2OnDraw(
         return FALSE;
 
     wxBitmap*                       pBitmap;
         return FALSE;
 
     wxBitmap*                       pBitmap;

-    RECTL                           vRect;

     bool                            bIsSelected = pUser->fsState & BDS_HILITED;
     wxClientDC                      vDc(this);
 
     bool                            bIsSelected = pUser->fsState & BDS_HILITED;
     wxClientDC                      vDc(this);
 


@@ -134,7 +131,6 @@ bool wxBitmapButton::OS2OnDraw(
     // Centre the bitmap in the control area
     //
     int                             nX         = 0;
     // 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;
     int                             nX1        = 0;
     int                             nY1        = 0;
     int                             nWidth     = vDc.m_vRclPaint.xRight - vDc.m_vRclPaint.xLeft;


@@ -193,10 +189,8 @@ void wxBitmapButton::DrawFace (
     //
     // Set up drawing colors
     //
     //
     // 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);
+    wxPen                           vHiLitePen(wxColour(255, 255, 255), 2, wxSOLID); // White
+    wxPen                           vDarkShadowPen(wxColour(85, 85, 85), 2, wxSOLID);

     wxColour                        vFaceColor(wxColour(204, 204, 204)); // Light Grey
 
     //
     wxColour                        vFaceColor(wxColour(204, 204, 204)); // Light Grey
 
     //


@@ -208,52 +202,29 @@ void wxBitmapButton::DrawFace (
     // Draw the border
     //
     rDC.SetPen(bSel ? vDarkShadowPen : vHiLitePen);
     // 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.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.DrawLine( rDC.m_vRclPaint.xLeft + 1

-                 ,rDC.m_vRclPaint.yTop + 2
+                 ,rDC.m_vRclPaint.yTop - 1

                  ,rDC.m_vRclPaint.xLeft + 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.DrawLine( rDC.m_vRclPaint.xLeft + 1

-                 ,rDC.m_vRclPaint.yBottom - 2
+                 ,rDC.m_vRclPaint.yBottom + 1

                  ,rDC.m_vRclPaint.xRight - 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.DrawLine( rDC.m_vRclPaint.xRight - 1

-                 ,rDC.m_vRclPaint.yBottom - 2
-                 ,rDC.m_vRclPaint.xRight - 1

                  ,rDC.m_vRclPaint.yTop - 1
                  ,rDC.m_vRclPaint.yTop - 1

+                 ,rDC.m_vRclPaint.xRight - 1
+                 ,rDC.m_vRclPaint.yBottom + 1

                 );
                 );

+

 } // end of wxBitmapButton::DrawFace
 
 void wxBitmapButton::DrawButtonFocus (
 } // end of wxBitmapButton::DrawFace
 
 void wxBitmapButton::DrawButtonFocus (