Fixed regression: in wxPropertyGrid::PerformValidation(), wxPGProperty::ValidateValue...

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

diff --git a/include/wx/osx/bmpbuttn.h b/include/wx/osx/bmpbuttn.h
index 265d2757bd2d91c57337667d7eb42bd9d19a320c..9cb9bb70ce5e0f9a0e31c38ed25b4741f4299cc9 100644 (file)
--- a/include/wx/osx/bmpbuttn.h
+++ b/include/wx/osx/bmpbuttn.h
@@ -9,25 +9,21 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_BMPBUTTN_H_
-#define _WX_BMPBUTTN_H_
+#ifndef _WX_OSX_BMPBUTTN_H_
+#define _WX_OSX_BMPBUTTN_H_
 
 #include "wx/button.h"
 
-WXDLLIMPEXP_DATA_CORE(extern const char) wxButtonNameStr[];
-
 #define wxDEFAULT_BUTTON_MARGIN 4
 
-class WXDLLIMPEXP_CORE wxBitmapButton: public wxBitmapButtonBase
+class WXDLLIMPEXP_CORE wxBitmapButton : public wxBitmapButtonBase
 {
-    DECLARE_DYNAMIC_CLASS(wxBitmapButton)
-
 public:
     wxBitmapButton()
         {
             SetMargins(wxDEFAULT_BUTTON_MARGIN, wxDEFAULT_BUTTON_MARGIN);
         }
-    
+
     wxBitmapButton(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
@@ -43,11 +39,12 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxButtonNameStr);
 
-    virtual void SetBitmapLabel(const wxBitmap& bitmap);
-
 protected:
-    virtual wxSize DoGetBestSize() const;    
+    virtual wxSize DoGetBestSize() const;
+
+    virtual void DoSetBitmap(const wxBitmap& bitmap, State which);
+
+    DECLARE_DYNAMIC_CLASS(wxBitmapButton)
 };
 
-#endif
-    // _WX_BMPBUTTN_H_
+#endif // _WX_OSX_BMPBUTTN_H_