bugfixes, bugfixes, bugfixes...

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

diff --git a/include/wx/mac/button.h b/include/wx/mac/button.h
index 3f4d6884529b0a20b1636aedab1b8c8a7186ecf0..680652b3e75550bd474e17db0c0b8a774f30a25b 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
 WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr;
 
 // Pushbutton

-class WXDLLEXPORT wxButton: public wxControl
+class WXDLLEXPORT wxButton: public wxButtonBase

 {
   DECLARE_DYNAMIC_CLASS(wxButton)
  public:
 {
   DECLARE_DYNAMIC_CLASS(wxButton)
  public:


@@ -43,8 +43,12 @@ class WXDLLEXPORT wxButton: public wxControl
            const wxString& name = wxButtonNameStr);
 
        virtual void MacHandleControlClick( ControlHandle control , SInt16 controlpart ) ;
            const wxString& name = wxButtonNameStr);
 
        virtual void MacHandleControlClick( ControlHandle control , SInt16 controlpart ) ;

+    static wxSize GetDefaultSize();
+

   virtual void SetDefault();
   virtual void Command(wxCommandEvent& event);
   virtual void SetDefault();
   virtual void Command(wxCommandEvent& event);

+protected:
+    virtual wxSize DoGetBestSize() const ;

 };
 
 #endif
 };
 
 #endif