X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9467bdb7f5bfde9f99331097daacb93564ca122e..2028c33ab5a39a12bd410ac953731a56ad6377ba:/src/univ/button.cpp?ds=inline

diff --git a/src/univ/button.cpp b/src/univ/button.cpp
index 39ac1eb1b8..4d9a843084 100644
--- a/src/univ/button.cpp
+++ b/src/univ/button.cpp
@@ -126,8 +126,11 @@ bool wxButton::Create(wxWindow *parent,
         return false;
 
     SetLabel(label);
-    SetImageLabel(bitmap);
-    // SetBestSize(size); -- called by SetImageLabel()
+
+    if (bitmap.Ok())
+        SetBitmap(bitmap); // SetInitialSize called by SetBitmap()
+    else
+        SetInitialSize(size);
 
     CreateInputHandler(wxINP_HANDLER_BUTTON);
 
@@ -210,7 +213,7 @@ void wxButton::DoDraw(wxControlRenderer *renderer)
         renderer->DrawButtonBorder();
     }
 
-    renderer->DrawLabel(m_bitmap, m_marginBmpX, m_marginBmpY);
+    renderer->DrawButtonLabel(m_bitmap, m_marginBmpX, m_marginBmpY);
 }
 
 bool wxButton::DoDrawBackground(wxDC& dc)
@@ -312,24 +315,29 @@ wxInputHandler *wxButton::GetStdInputHandler(wxInputHandler *handlerDef)
 // misc
 // ----------------------------------------------------------------------------
 
-void wxButton::SetImageLabel(const wxBitmap& bitmap)
+void wxButton::DoSetBitmap(const wxBitmap& bitmap, State which)
 {
-    m_bitmap = bitmap;
+    // we support only one bitmap right now, although this wouldn't be
+    // difficult to change
+    if ( which == State_Normal )
+        m_bitmap = bitmap;
 
-    SetImageMargins(DEFAULT_BTN_MARGIN_X, DEFAULT_BTN_MARGIN_Y);
+    SetBitmapMargins(DEFAULT_BTN_MARGIN_X, DEFAULT_BTN_MARGIN_Y);
 }
 
-void wxButton::SetImageMargins(wxCoord x, wxCoord y)
+void wxButton::DoSetBitmapMargins(wxCoord x, wxCoord y)
 {
     m_marginBmpX = x + 2;
     m_marginBmpY = y + 2;
 
-    SetBestSize(wxDefaultSize);
+    SetInitialSize(wxDefaultSize);
 }
 
-void wxButton::SetDefault()
+wxWindow *wxButton::SetDefault()
 {
     m_isDefault = true;
+
+    return wxButtonBase::SetDefault();
 }
 
 // ============================================================================