Use wxWebKitCtrlNameStr to adhere to the convention used by other wx classes.

[wxWidgets.git] / include / wx / bmpbuttn.h

diff --git a/include/wx/bmpbuttn.h b/include/wx/bmpbuttn.h
index 8837752b0089e457e0a3849035cd15c280d8ddf3..f34ae509359e147354387391f9289bc56188c350 100644 (file)
--- a/include/wx/bmpbuttn.h
+++ b/include/wx/bmpbuttn.h
@@ -18,10 +18,10 @@
 
 #include "wx/button.h"
 
 
 #include "wx/button.h"
 

-// FIXME: right now only wxMSW and wxGTK implement bitmap support in wxButton
+// FIXME: right now only wxMSW, wxGTK and wxOSX implement bitmap support in wxButton

 //        itself, this shouldn't be used for the other platforms neither
 //        when all of them do it
 //        itself, this shouldn't be used for the other platforms neither
 //        when all of them do it

-#if (defined(__WXMSW__) || defined(__WXGTK__)) && !defined(__WXUNIVERSAL__)
+#if (defined(__WXMSW__) || defined(__WXGTK20__) || defined(__WXOSX__)) && !defined(__WXUNIVERSAL__)

     #define wxHAS_BUTTON_BITMAP
 #endif
 
     #define wxHAS_BUTTON_BITMAP
 #endif
 


@@ -41,6 +41,29 @@ public:
 #endif // wxHAS_BUTTON_BITMAP
     }
 
 #endif // wxHAS_BUTTON_BITMAP
     }
 

+    bool Create(wxWindow *parent,
+                wxWindowID winid,
+                const wxPoint& pos,
+                const wxSize& size,
+                long style,
+                const wxValidator& validator,
+                const wxString& name)
+    {
+        // We use wxBU_NOTEXT to let the base class Create() know that we are
+        // not going to show the label: this is a hack needed for wxGTK where
+        // we can show both label and bitmap only with GTK 2.6+ but we always
+        // can show just one of them and this style allows us to choose which
+        // one we need.
+        //
+        // And we also use wxBU_EXACTFIT to avoid being resized up to the
+        // standard button size as this doesn't make sense for bitmap buttons
+        // which are not standard anyhow and should fit their bitmap size.
+        return wxButton::Create(parent, winid, "",
+                                pos, size,
+                                style | wxBU_NOTEXT | wxBU_EXACTFIT,
+                                validator, name);
+    }
+

     // set/get the margins around the button
     virtual void SetMargins(int x, int y)
     {
     // set/get the margins around the button
     virtual void SetMargins(int x, int y)
     {