X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a21175918ecedbae7d04a58acca5e90a6b59633d..cc3977bf132d40cb66c6b488890ef67a396d4a0a:/src/msw/bmpbuttn.cpp

diff --git a/src/msw/bmpbuttn.cpp b/src/msw/bmpbuttn.cpp
index 2e2072d0a2..217b1aec63 100644
--- a/src/msw/bmpbuttn.cpp
+++ b/src/msw/bmpbuttn.cpp
@@ -127,17 +127,22 @@ bool wxBitmapButton::Create(wxWindow *parent,
                             const wxBitmap& bitmap,
                             const wxPoint& pos,
                             const wxSize& size, long style,
-                            const wxValidator& wxVALIDATOR_PARAM(validator),
+                            const wxValidator& validator,
                             const wxString& name)
 {
-    if ( !wxBitmapButtonBase::Create(parent, id, "",
-                                     pos, size,
-                                     style | wxBU_NOTEXT,
+    if ( !wxBitmapButtonBase::Create(parent, id, pos, size, style,
                                      validator, name) )
         return false;
 
     SetBitmapLabel(bitmap);
 
+    if ( !size.IsFullySpecified() )
+    {
+        // As our bitmap has just changed, our best size has changed as well so
+        // reset the initial size using the new value.
+        SetInitialSize(size);
+    }
+
     return true;
 }
 
@@ -180,6 +185,11 @@ void wxBitmapButton::DoSetBitmap(const wxBitmap& bitmap, State which)
                 // from the normal one
                 m_disabledSetByUser = true;
                 break;
+
+            default:
+                // nothing special to do but include the default clause to
+                // suppress gcc warnings
+                ;
         }
     }