Applied patch [ 1378183 ] Mac: wxNotebook::HitTest off by one

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

diff --git a/src/os2/button.cpp b/src/os2/button.cpp
index 397ee99edaaa70bedd6871c5e89739d536aa8387..3e831bcf91fb8eb03c2786b3518e76dae9037901 100644 (file)
--- a/src/os2/button.cpp
+++ b/src/os2/button.cpp
@@ -23,6 +23,7 @@
     #include "wx/scrolwin.h"
 #endif
 
     #include "wx/scrolwin.h"
 #endif
 

+#include "wx/stockitem.h"

 #include "wx/os2/private.h"
 
 #define BUTTON_HEIGHT_FROM_CHAR_HEIGHT(cy) (11*EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy)/10)
 #include "wx/os2/private.h"
 
 #define BUTTON_HEIGHT_FROM_CHAR_HEIGHT(cy) (11*EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy)/10)


@@ -40,17 +41,21 @@ IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
 
 // Button
 
 
 // Button
 

-bool wxButton::Create(
-  wxWindow*                         pParent
-, wxWindowID                        vId
-, const wxString&                   rsLabel
-, const wxPoint&                    rPos
-, const wxSize&                     rSize
-, long                              lStyle
-, const wxValidator&                rValidator
-, const wxString&                   rsName
-)
+bool wxButton::Create( wxWindow*          pParent,
+                       wxWindowID         vId,
+                       const wxString&    rsLbl,
+                       const wxPoint&     rPos,
+                       const wxSize&      rSize,
+                       long               lStyle,
+                       const wxValidator& rValidator,
+                       const wxString&    rsName)

 {
 {

+    wxString rsLabel(rsLbl);
+    if (rsLabel.empty() && wxIsStockID(vId))
+        rsLabel = wxGetStockLabel(vId);
+
+    wxString                        sLabel = ::wxPMTextToLabel(rsLabel);
+

     SetName(rsName);
 #if wxUSE_VALIDATORS
     SetValidator(rValidator);
     SetName(rsName);
 #if wxUSE_VALIDATORS
     SetValidator(rValidator);


@@ -73,7 +78,7 @@ bool wxButton::Create(
 
     m_hWnd = (WXHWND)::WinCreateWindow( GetHwndOf(pParent)   // Parent handle
                                        ,WC_BUTTON            // A Button class window
 
     m_hWnd = (WXHWND)::WinCreateWindow( GetHwndOf(pParent)   // Parent handle
                                        ,WC_BUTTON            // A Button class window

-                                       ,(PSZ)rsLabel.c_str() // Button text
+                                       ,(PSZ)sLabel.c_str()  // Button text

                                        ,lStyle               // Button style
                                        ,0, 0, 0, 0           // Location and size
                                        ,GetHwndOf(pParent)   // Owner handle
                                        ,lStyle               // Button style
                                        ,0, 0, 0, 0           // Location and size
                                        ,GetHwndOf(pParent)   // Owner handle


@@ -105,7 +110,7 @@ bool wxButton::Create(
             ,rSize.y
            );
     delete pButtonFont;
             ,rSize.y
            );
     delete pButtonFont;

-    return TRUE;
+    return true;

 } // end of wxButton::Create
 
 wxButton::~wxButton()
 } // end of wxButton::Create
 
 wxButton::~wxButton()


@@ -134,6 +139,7 @@ wxSize wxButton::DoGetBestSize() const
     int                             nWidthButton;
     int                             nWidthChar;
     int                             nHeightChar;
     int                             nWidthButton;
     int                             nWidthChar;
     int                             nHeightChar;

+    wxFont                          vFont = (wxFont)GetFont();

 
     GetTextExtent( rsLabel
                   ,&nWidthButton
 
     GetTextExtent( rsLabel
                   ,&nWidthButton


@@ -143,7 +149,7 @@ wxSize wxButton::DoGetBestSize() const
     wxGetCharSize( GetHWND()
                   ,&nWidthChar
                   ,&nHeightChar
     wxGetCharSize( GetHWND()
                   ,&nWidthChar
                   ,&nHeightChar

-                  ,(wxFont*)&GetFont()
+                  ,&vFont

                  );
 
     //
                  );
 
     //


@@ -159,7 +165,7 @@ wxSize wxButton::DoGetBestSize() const
     //
     // Need a little extra to make it look right
     //
     //
     // Need a little extra to make it look right
     //

-    nHeightButton += nHeightChar/1.5;
+    nHeightButton += (int)(nHeightChar/1.5);

 
     if (!HasFlag(wxBU_EXACTFIT))
     {
 
     if (!HasFlag(wxBU_EXACTFIT))
     {


@@ -230,16 +236,12 @@ void wxButton::SetDefault()
     wxCHECK_RET( pParent, _T("button without parent?") );
 
     //
     wxCHECK_RET( pParent, _T("button without parent?") );
 
     //

-    // Set this one as the default button both for wxWindows and Windows
+    // Set this one as the default button both for wxWidgets and Windows

     //
     wxWindow*                       pWinOldDefault = pParent->SetDefaultItem(this);
 
     //
     wxWindow*                       pWinOldDefault = pParent->SetDefaultItem(this);
 

-    SetDefaultStyle( wxDynamicCast(pWinOldDefault, wxButton)
-                    ,FALSE
-                   );
-    SetDefaultStyle( this
-                    ,TRUE
-                   );
+    SetDefaultStyle( wxDynamicCast(pWinOldDefault, wxButton), false);
+    SetDefaultStyle( this, true );

 } // end of wxButton::SetDefault
 
 void wxButton::SetTmpDefault()
 } // end of wxButton::SetDefault
 
 void wxButton::SetTmpDefault()


@@ -251,12 +253,8 @@ void wxButton::SetTmpDefault()
     wxWindow*                       pWinOldDefault = pParent->GetDefaultItem();
 
     pParent->SetTmpDefaultItem(this);
     wxWindow*                       pWinOldDefault = pParent->GetDefaultItem();
 
     pParent->SetTmpDefaultItem(this);

-    SetDefaultStyle( wxDynamicCast(pWinOldDefault, wxButton)
-                    ,FALSE
-                   );
-    SetDefaultStyle( this
-                    ,TRUE
-                   );
+    SetDefaultStyle( wxDynamicCast(pWinOldDefault, wxButton), false);
+    SetDefaultStyle( this, true );

 } // end of wxButton::SetTmpDefault
 
 void wxButton::UnsetTmpDefault()
 } // end of wxButton::SetTmpDefault
 
 void wxButton::UnsetTmpDefault()


@@ -269,12 +267,8 @@ void wxButton::UnsetTmpDefault()
 
     wxWindow*                       pWinOldDefault = pParent->GetDefaultItem();
 
 
     wxWindow*                       pWinOldDefault = pParent->GetDefaultItem();
 

-    SetDefaultStyle( this
-                    ,FALSE
-                   );
-    SetDefaultStyle( wxDynamicCast(pWinOldDefault, wxButton)
-                    ,TRUE
-                   );
+    SetDefaultStyle( this, false );
+    SetDefaultStyle( wxDynamicCast(pWinOldDefault, wxButton), true );

 } // end of wxButton::UnsetTmpDefault
 
 void wxButton::SetDefaultStyle(
 } // end of wxButton::UnsetTmpDefault
 
 void wxButton::SetDefaultStyle(


@@ -311,7 +305,7 @@ void wxButton::SetDefaultStyle(
         if ((lStyle & BS_USERBUTTON) != BS_USERBUTTON)
         {
             if (bOn)
         if ((lStyle & BS_USERBUTTON) != BS_USERBUTTON)
         {
             if (bOn)

-                lStyle | BS_DEFAULT;
+                lStyle |= BS_DEFAULT;

             else
                 lStyle &= ~BS_DEFAULT;
             ::WinSetWindowULong(GetHwndOf(pBtn), QWL_STYLE, lStyle);
             else
                 lStyle &= ~BS_DEFAULT;
             ::WinSetWindowULong(GetHwndOf(pBtn), QWL_STYLE, lStyle);


@@ -331,12 +325,9 @@ void wxButton::SetDefaultStyle(
 // event/message handlers
 // ----------------------------------------------------------------------------
 
 // event/message handlers
 // ----------------------------------------------------------------------------
 

-bool wxButton::OS2Command(
-  WXUINT                            uParam
-, WXWORD                            wId
-)
+bool wxButton::OS2Command(WXUINT uParam, WXWORD WXUNUSED(wId))

 {
 {

-    bool                            bProcessed = FALSE;
+    bool bProcessed = false;

 
     switch (uParam)
     {
 
     switch (uParam)
     {


@@ -345,21 +336,20 @@ bool wxButton::OS2Command(
             bProcessed = SendClickEvent();
             break;
     }
             bProcessed = SendClickEvent();
             break;
     }

+

     return bProcessed;
 } // end of wxButton::OS2Command
 
     return bProcessed;
 } // end of wxButton::OS2Command
 

-WXHBRUSH wxButton::OnCtlColor(
-  WXHDC                             pDC
-, WXHWND                            pWnd
-, WXUINT                            nCtlColor
-, WXUINT                            uMessage
-, WXWPARAM                          wParam
-, WXLPARAM                          lParam
-)
+WXHBRUSH wxButton::OnCtlColor( WXHDC    WXUNUSED(pDC),
+                               WXHWND   WXUNUSED(pWnd),
+                               WXUINT   WXUNUSED(nCtlColor),
+                               WXUINT   WXUNUSED(uMessage),
+                               WXWPARAM WXUNUSED(wParam),
+                               WXLPARAM WXUNUSED(lParam) )

 {
 {

-    wxBrush*                        pBackgroundBrush = wxTheBrushList->FindOrCreateBrush( GetBackgroundColour()
-                                                                                         ,wxSOLID
-                                                                                        );
+    wxBrush* pBackgroundBrush = wxTheBrushList->FindOrCreateBrush( GetBackgroundColour()
+                                                                  ,wxSOLID
+                                                                  );

 
     return (WXHBRUSH)pBackgroundBrush->GetResourceHandle();
 } // end of wxButton::OnCtlColor
 
     return (WXHBRUSH)pBackgroundBrush->GetResourceHandle();
 } // end of wxButton::OnCtlColor


@@ -400,11 +390,9 @@ WXDWORD wxButton::OS2GetStyle(
     return dwStyle;
 } // end of wxButton::OS2GetStyle
 
     return dwStyle;
 } // end of wxButton::OS2GetStyle
 

-MRESULT wxButton::WindowProc(
-  WXUINT                            uMsg
-, WXWPARAM                          wParam
-, WXLPARAM                          lParam
-)
+MRESULT wxButton::WindowProc( WXUINT   uMsg,
+                              WXWPARAM wParam,
+                              WXLPARAM lParam )

 {
     //
     // When we receive focus, we want to temporary become the default button in
 {
     //
     // When we receive focus, we want to temporary become the default button in


@@ -447,4 +435,3 @@ MRESULT wxButton::WindowProc(
                                      ,lParam
                                     ));
 } // end of wxWindowProc
                                      ,lParam
                                     ));
 } // end of wxWindowProc

-