wchar_t is now always required, updated chartype.h check accordingly

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

diff --git a/src/univ/button.cpp b/src/univ/button.cpp
index f04966be286c83a4632741964eeb9bf3938f5b55..7bda74e449451a0aafc15ed36fbe2d4765171f00 100644 (file)
--- a/src/univ/button.cpp
+++ b/src/univ/button.cpp
@@ -128,9 +128,9 @@ bool wxButton::Create(wxWindow *parent,
     SetLabel(label);
 
     if (bitmap.Ok())
-        SetImageLabel(bitmap); // SetBestSize called by SetImageLabel()
+        SetImageLabel(bitmap); // SetInitialSize called by SetImageLabel()
     else
-        SetBestSize(size);
+        SetInitialSize(size);
 
     CreateInputHandler(wxINP_HANDLER_BUTTON);
 
@@ -327,12 +327,14 @@ void wxButton::SetImageMargins(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();
 }
 
 // ============================================================================