applied part of patch 1169925: fix errors with multibyte <-> wx conversions

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

diff --git a/src/univ/button.cpp b/src/univ/button.cpp
index 1e925d9af1f63fffab61b10e79ba2bf8709e9ae2..b70394dc5c6ea890b5d34c14a82d5f9892987ddc 100644 (file)
--- a/src/univ/button.cpp
+++ b/src/univ/button.cpp
@@ -41,6 +41,7 @@
 #include "wx/univ/inphand.h"
 #include "wx/univ/theme.h"
 #include "wx/univ/colschem.h"
 #include "wx/univ/inphand.h"
 #include "wx/univ/theme.h"
 #include "wx/univ/colschem.h"

+#include "wx/stockitem.h"

 
 // ----------------------------------------------------------------------------
 // constants
 
 // ----------------------------------------------------------------------------
 // constants


@@ -60,68 +61,47 @@ IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
 // creation
 // ----------------------------------------------------------------------------
 
 // creation
 // ----------------------------------------------------------------------------
 

-wxButtonBase::wxButtonBase()
-{
-}
-
-wxButton::wxButton()
-{
-    Init();
-}
-
-wxButton::wxButton(wxWindow *parent,
-                   wxWindowID id,
-                   const wxBitmap& bitmap,
-                   const wxString& label,
-                   const wxPoint& pos,
-                   const wxSize& size,
-                   long style,
-                   const wxValidator& validator,
-                   const wxString& name)
-{
-    Init();
-
-    Create(parent, id, bitmap, label, pos, size, style, validator, name);
-}
-
-wxButton::wxButton(wxWindow *parent,
-                   wxWindowID id,
-                   const wxString& label,
-                   const wxPoint& pos,
-                   const wxSize& size,
-                   long style,
-                   const wxValidator& validator,
-                   const wxString& name)
-{
-    Init();
-
-    Create(parent, id, label, pos, size, style, validator, name);
-}
-

 void wxButton::Init()
 {
     m_isPressed =
 void wxButton::Init()
 {
     m_isPressed =

-    m_isDefault = FALSE;
+    m_isDefault = false;

 }
 
 bool wxButton::Create(wxWindow *parent,
                       wxWindowID id,
                       const wxBitmap& bitmap,
 }
 
 bool wxButton::Create(wxWindow *parent,
                       wxWindowID id,
                       const wxBitmap& bitmap,

-                      const wxString &label,
+                      const wxString &lbl,

                       const wxPoint &pos,
                       const wxSize &size,
                       long style,
                       const wxValidator& validator,
                       const wxString &name)
 {
                       const wxPoint &pos,
                       const wxSize &size,
                       long style,
                       const wxValidator& validator,
                       const wxString &name)
 {

-    // center label by default
-    if ( !(style & wxALIGN_MASK) )
-    {
-        style |= wxALIGN_CENTRE_HORIZONTAL | wxALIGN_CENTRE_VERTICAL;
-    }
+    wxString label(lbl);
+    if (label.empty() && wxIsStockID(id))
+        label = wxGetStockLabel(id);
+
+    long ctrl_style = style & !wxBU_ALIGN_MASK;
+
+    wxASSERT_MSG( (ctrl_style & wxALIGN_MASK) == 0,
+                  _T("Some style conflicts with align flags") );

 
 

-    if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
-        return FALSE;
+    if((style & wxBU_RIGHT) == wxBU_RIGHT)
+        ctrl_style |= wxALIGN_RIGHT;
+    else if((style & wxBU_LEFT) == wxBU_LEFT)
+        ctrl_style |= wxALIGN_LEFT;
+    else
+        ctrl_style |= wxALIGN_CENTRE_HORIZONTAL;
+
+    if((style & wxBU_TOP) == wxBU_TOP)
+        ctrl_style |= wxALIGN_TOP;
+    else if((style & wxBU_BOTTOM) == wxBU_BOTTOM)
+        ctrl_style |= wxALIGN_BOTTOM;
+    else
+        ctrl_style |= wxALIGN_CENTRE_VERTICAL;
+
+    if ( !wxControl::Create(parent, id, pos, size, ctrl_style, validator, name) )
+        return false;

 
     SetLabel(label);
     SetImageLabel(bitmap);
 
     SetLabel(label);
     SetImageLabel(bitmap);


@@ -129,7 +109,7 @@ bool wxButton::Create(wxWindow *parent,
 
     CreateInputHandler(wxINP_HANDLER_BUTTON);
 
 
     CreateInputHandler(wxINP_HANDLER_BUTTON);
 

-    return TRUE;
+    return true;

 }
 
 wxButton::~wxButton()
 }
 
 wxButton::~wxButton()


@@ -177,7 +157,7 @@ wxSize wxButton::DoGetBestClientSize() const
         width += m_bitmap.GetWidth() + 2*m_marginBmpX;
     }
 
         width += m_bitmap.GetWidth() + 2*m_marginBmpX;
     }
 

-    // The default size should not be adjusted, so the code is moved into the 
+    // The default size should not be adjusted, so the code is moved into the

     // renderer. This is conceptual wrong but currently the only solution.
     // (Otto Wyss, Patch 664399)
 
     // renderer. This is conceptual wrong but currently the only solution.
     // (Otto Wyss, Patch 664399)
 


@@ -217,7 +197,7 @@ bool wxButton::DoDrawBackground(wxDC& dc)
     wxSize size = GetSize();
     rect.width = size.x;
     rect.height = size.y;
     wxSize size = GetSize();
     rect.width = size.x;
     rect.height = size.y;

-    
+

     if ( GetBackgroundBitmap().Ok() )
     {
         // get the bitmap and the flags
     if ( GetBackgroundBitmap().Ok() )
     {
         // get the bitmap and the flags


@@ -232,7 +212,7 @@ bool wxButton::DoDrawBackground(wxDC& dc)
                                       rect, GetStateFlags());
     }
 
                                       rect, GetStateFlags());
     }
 

-    return TRUE;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -243,7 +223,7 @@ void wxButton::Press()
 {
     if ( !m_isPressed )
     {
 {
     if ( !m_isPressed )
     {

-        m_isPressed = TRUE;
+        m_isPressed = true;

 
         Refresh();
     }
 
         Refresh();
     }


@@ -253,7 +233,7 @@ void wxButton::Release()
 {
     if ( m_isPressed )
     {
 {
     if ( m_isPressed )
     {

-        m_isPressed = FALSE;
+        m_isPressed = false;

 
         Refresh();
     }
 
         Refresh();
     }


@@ -295,7 +275,7 @@ bool wxButton::PerformAction(const wxControlAction& action,
     else
         return wxControl::PerformAction(action, numArg, strArg);
 
     else
         return wxControl::PerformAction(action, numArg, strArg);
 

-    return TRUE;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -313,13 +293,13 @@ void wxButton::SetImageMargins(wxCoord x, wxCoord y)
 {
     m_marginBmpX = x + 2;
     m_marginBmpY = y + 2;
 {
     m_marginBmpX = x + 2;
     m_marginBmpY = y + 2;

-    
+

     SetBestSize(wxDefaultSize);
 }
 
 void wxButton::SetDefault()
 {
     SetBestSize(wxDefaultSize);
 }
 
 void wxButton::SetDefault()
 {

-    m_isDefault = TRUE;
+    m_isDefault = true;

 }
 
 // ============================================================================
 }
 
 // ============================================================================


@@ -330,7 +310,7 @@ wxStdButtonInputHandler::wxStdButtonInputHandler(wxInputHandler *handler)
                        : wxStdInputHandler(handler)
 {
     m_winCapture = NULL;
                        : wxStdInputHandler(handler)
 {
     m_winCapture = NULL;

-    m_winHasMouse = FALSE;
+    m_winHasMouse = false;

 }
 
 bool wxStdButtonInputHandler::HandleKey(wxInputConsumer *consumer,
 }
 
 bool wxStdButtonInputHandler::HandleKey(wxInputConsumer *consumer,


@@ -342,7 +322,7 @@ bool wxStdButtonInputHandler::HandleKey(wxInputConsumer *consumer,
     {
         consumer->PerformAction(wxACTION_BUTTON_TOGGLE);
 
     {
         consumer->PerformAction(wxACTION_BUTTON_TOGGLE);
 

-        return TRUE;
+        return true;

     }
 
     return wxStdInputHandler::HandleKey(consumer, event, pressed);
     }
 
     return wxStdInputHandler::HandleKey(consumer, event, pressed);


@@ -365,11 +345,11 @@ bool wxStdButtonInputHandler::HandleMouse(wxInputConsumer *consumer,
         {
             m_winCapture = consumer->GetInputWindow();
             m_winCapture->CaptureMouse();
         {
             m_winCapture = consumer->GetInputWindow();
             m_winCapture->CaptureMouse();

-            m_winHasMouse = TRUE;
+            m_winHasMouse = true;

 
             consumer->PerformAction(wxACTION_BUTTON_PRESS);
 
 
             consumer->PerformAction(wxACTION_BUTTON_PRESS);
 

-            return TRUE;
+            return true;

         }
         else if ( event.LeftUp() )
         {
         }
         else if ( event.LeftUp() )
         {


@@ -384,7 +364,7 @@ bool wxStdButtonInputHandler::HandleMouse(wxInputConsumer *consumer,
                 // this will generate a click event
                 consumer->PerformAction(wxACTION_BUTTON_TOGGLE);
 
                 // this will generate a click event
                 consumer->PerformAction(wxACTION_BUTTON_TOGGLE);
 

-                return TRUE;
+                return true;

             }
             //else: the mouse was released outside the window, this doesn't
             //      count as a click
             }
             //else: the mouse was released outside the window, this doesn't
             //      count as a click


@@ -406,27 +386,27 @@ bool wxStdButtonInputHandler::HandleMouseMove(wxInputConsumer *consumer,
         if ( event.Leaving() )
         {
             // remember that the mouse is now outside
         if ( event.Leaving() )
         {
             // remember that the mouse is now outside

-            m_winHasMouse = FALSE;
+            m_winHasMouse = false;

 
             // we do have a pressed button, so release it
 
             // we do have a pressed button, so release it

-            consumer->GetInputWindow()->SetCurrent(FALSE);
+            consumer->GetInputWindow()->SetCurrent(false);

             consumer->PerformAction(wxACTION_BUTTON_RELEASE);
 
             consumer->PerformAction(wxACTION_BUTTON_RELEASE);
 

-            return TRUE;
+            return true;

         }
         // and entering it back should make it pressed again if it had been
         // pressed
         else if ( event.Entering() )
         {
             // the mouse is (back) inside the button
         }
         // and entering it back should make it pressed again if it had been
         // pressed
         else if ( event.Entering() )
         {
             // the mouse is (back) inside the button

-            m_winHasMouse = TRUE;
+            m_winHasMouse = true;

 
             // we did have a pressed button which we released when leaving the
             // window, press it again
 
             // we did have a pressed button which we released when leaving the
             // window, press it again

-            consumer->GetInputWindow()->SetCurrent(TRUE);
+            consumer->GetInputWindow()->SetCurrent(true);

             consumer->PerformAction(wxACTION_BUTTON_PRESS);
 
             consumer->PerformAction(wxACTION_BUTTON_PRESS);
 

-            return TRUE;
+            return true;

         }
     }
 
         }
     }
 


@@ -436,16 +416,16 @@ bool wxStdButtonInputHandler::HandleMouseMove(wxInputConsumer *consumer,
 bool wxStdButtonInputHandler::HandleFocus(wxInputConsumer * WXUNUSED(consumer),
                                           const wxFocusEvent& WXUNUSED(event))
 {
 bool wxStdButtonInputHandler::HandleFocus(wxInputConsumer * WXUNUSED(consumer),
                                           const wxFocusEvent& WXUNUSED(event))
 {

-    // buttons change appearance when they get/lose focus, so return TRUE to
+    // buttons change appearance when they get/lose focus, so return true to

     // refresh
     // refresh

-    return TRUE;
+    return true;

 }
 
 bool wxStdButtonInputHandler::HandleActivation(wxInputConsumer *consumer,
                                                bool WXUNUSED(activated))
 {
     // the default button changes appearance when the app is [de]activated, so
 }
 
 bool wxStdButtonInputHandler::HandleActivation(wxInputConsumer *consumer,
                                                bool WXUNUSED(activated))
 {
     // the default button changes appearance when the app is [de]activated, so

-    // return TRUE to refresh
+    // return true to refresh

     return wxStaticCast(consumer->GetInputWindow(), wxButton)->IsDefault();
 }
 
     return wxStaticCast(consumer->GetInputWindow(), wxButton)->IsDefault();
 }