remove unused static wxColourFromPGLong function

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

diff --git a/src/univ/button.cpp b/src/univ/button.cpp
index 39ac1eb1b84006aaa5ac22e51dd8f5cbbeb829d0..7bda74e449451a0aafc15ed36fbe2d4765171f00 100644 (file)
--- a/src/univ/button.cpp
+++ b/src/univ/button.cpp
@@ -126,8 +126,11 @@ bool wxButton::Create(wxWindow *parent,
         return false;
 
     SetLabel(label);
         return false;
 
     SetLabel(label);

-    SetImageLabel(bitmap);
-    // SetBestSize(size); -- called by SetImageLabel()
+
+    if (bitmap.Ok())
+        SetImageLabel(bitmap); // SetInitialSize called by SetImageLabel()
+    else
+        SetInitialSize(size);

 
     CreateInputHandler(wxINP_HANDLER_BUTTON);
 
 
     CreateInputHandler(wxINP_HANDLER_BUTTON);
 


@@ -324,12 +327,14 @@ 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);
+    SetInitialSize(wxDefaultSize);

 }
 
 }
 

-void wxButton::SetDefault()
+wxWindow *wxButton::SetDefault()

 {
     m_isDefault = true;
 {
     m_isDefault = true;

+
+    return wxButtonBase::SetDefault();

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