diff --git a/include/wx/gtk/bmpbuttn.h b/include/wx/gtk/bmpbuttn.h
index a0a17b3ac0..15966f3f41 100644
--- a/include/wx/gtk/bmpbuttn.h
+++ b/include/wx/gtk/bmpbuttn.h
@@ -38,19 +38,9 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxButtonNameStr)
-    {
-        if ( !wxBitmapButtonBase::Create(parent, id, "",
-                                         pos, size,
-                                         style | wxBU_NOTEXT,
-                                         validator, name) )
-            return false;
-
-        SetBitmapLabel(bitmap);
-
-        return true;
-    }
+                const wxString& name = wxButtonNameStr);
 
+private:
     DECLARE_DYNAMIC_CLASS(wxBitmapButton)
 };
 
diff --git a/src/gtk/bmpbuttn.cpp b/src/gtk/bmpbuttn.cpp
index 5dcd049394..a3df929f8d 100644
--- a/src/gtk/bmpbuttn.cpp
+++ b/src/gtk/bmpbuttn.cpp
@@ -16,4 +16,30 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxButton)
 
+bool wxBitmapButton::Create(wxWindow *parent,
+                            wxWindowID id,
+                            const wxBitmap& bitmap,
+                            const wxPoint& pos,
+                            const wxSize& size,
+                            long style,
+                            const wxValidator& validator,
+                            const wxString& name)
+{
+    if ( !wxBitmapButtonBase::Create(parent, id, "",
+                                     pos, size,
+                                     style | wxBU_NOTEXT,
+                                     validator, name) )
+        return false;
+
+    if ( bitmap.IsOk() )
+    {
+        SetBitmapLabel(bitmap);
+
+        // we need to adjust the size after setting the bitmap as it may be too
+        // big for the default button size
+        SetInitialSize(size);
+    }
+
+    return true;
+}
 #endif // wxUSE_BMPBUTTON