applied SourceForge patch # 544164 (hidden virtual method in wxMenuBar)

[wxWidgets.git] / include / wx / mac / button.h

diff --git a/include/wx/mac/button.h b/include/wx/mac/button.h
index 3f4d6884529b0a20b1636aedab1b8c8a7186ecf0..12faee340c3c4403710773d9529a7ef10be9c12b 100644 (file)
--- a/include/wx/mac/button.h
+++ b/include/wx/mac/button.h
@@ -22,7 +22,7 @@
 WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr;
 
 // Pushbutton
-class WXDLLEXPORT wxButton: public wxControl
+class WXDLLEXPORT wxButton: public wxButtonBase
 {
   DECLARE_DYNAMIC_CLASS(wxButton)
  public:
@@ -42,9 +42,13 @@ class WXDLLEXPORT wxButton: public wxControl
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxButtonNameStr);
 
-       virtual void MacHandleControlClick( ControlHandle control , SInt16 controlpart ) ;
+       virtual void MacHandleControlClick( WXWidget control , short controlpart ) ;
+    static wxSize GetDefaultSize();
+
   virtual void SetDefault();
   virtual void Command(wxCommandEvent& event);
+protected:
+    virtual wxSize DoGetBestSize() const ;
 };
 
 #endif