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 821843ff1cf31429a32638493e7b44594465bfbb..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/stockitem.h"
 
 // ----------------------------------------------------------------------------
 // constants
@@ -69,20 +70,37 @@ void wxButton::Init()
 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)
 {
-    // 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((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, style, validator, name) )
+    if ( !wxControl::Create(parent, id, pos, size, ctrl_style, validator, name) )
         return false;
 
     SetLabel(label);
@@ -139,7 +157,7 @@ wxSize wxButton::DoGetBestClientSize() const
         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)
 
@@ -179,7 +197,7 @@ bool wxButton::DoDrawBackground(wxDC& dc)
     wxSize size = GetSize();
     rect.width = size.x;
     rect.height = size.y;
-    
+
     if ( GetBackgroundBitmap().Ok() )
     {
         // get the bitmap and the flags
@@ -275,7 +293,7 @@ void wxButton::SetImageMargins(wxCoord x, wxCoord y)
 {
     m_marginBmpX = x + 2;
     m_marginBmpY = y + 2;
-    
+
     SetBestSize(wxDefaultSize);
 }