Add wxFont::Underlined() and MakeUnderlined() methods.

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

diff --git a/include/wx/bmpbuttn.h b/include/wx/bmpbuttn.h
index a355111bc9f9533bba0479a22421134fe8935cd9..f34ae509359e147354387391f9289bc56188c350 100644 (file)
--- a/include/wx/bmpbuttn.h
+++ b/include/wx/bmpbuttn.h
@@ -18,10 +18,10 @@
 
 #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
-#if (defined(__WXMSW__) || defined(__WXGTK20__)) && !defined(__WXUNIVERSAL__)
+#if (defined(__WXMSW__) || defined(__WXGTK20__) || defined(__WXOSX__)) && !defined(__WXUNIVERSAL__)
     #define wxHAS_BUTTON_BITMAP
 #endif
 
@@ -43,7 +43,6 @@ public:
 
     bool Create(wxWindow *parent,
                 wxWindowID winid,
-                const wxBitmap& bitmap,
                 const wxPoint& pos,
                 const wxSize& size,
                 long style,
@@ -59,7 +58,8 @@ public:
         // 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, id, pos, size,
+        return wxButton::Create(parent, winid, "",
+                                pos, size,
                                 style | wxBU_NOTEXT | wxBU_EXACTFIT,
                                 validator, name);
     }