X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e5d05b907c823c87f7d4f92e535c15a7ee0124f2..3f7564f229450a9c036141878ee75cc09078a945:/include/wx/osx/button.h?ds=sidebyside

diff --git a/include/wx/osx/button.h b/include/wx/osx/button.h
index 48a8214450..3f4b2babf1 100644
--- a/include/wx/osx/button.h
+++ b/include/wx/osx/button.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        button.h
+// Name:        wx/osx/button.h
 // Purpose:     wxButton class
 // Author:      Stefan Csomor
 // Modified by:
@@ -41,8 +41,6 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxButtonNameStr);
 
-    static wxSize GetDefaultSize();
-
     virtual void SetLabel(const wxString& label);
     virtual wxWindow *SetDefault();
     virtual void Command(wxCommandEvent& event);
@@ -51,15 +49,11 @@ public:
 
     virtual bool        OSXHandleClicked( double timestampsec );
 
-protected:
-    virtual wxSize DoGetBestSize() const ;
-
 #if wxOSX_USE_COCOA
-    virtual wxBitmap DoGetBitmap(State which) const;
-    virtual void DoSetBitmap(const wxBitmap& bitmap, State which);
-    virtual void DoSetBitmapPosition(wxDirection dir);
-#endif // wxOSX_USE_COCOA
+    void OSXUpdateAfterLabelChange(const wxString& label);
+#endif
 
+protected:
     DECLARE_DYNAMIC_CLASS(wxButton)
 };
 
@@ -72,7 +66,7 @@ public:
              const wxString& label = wxEmptyString,
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
-             long style = 0,
+             long style = wxBORDER_NONE,
              const wxValidator& validator = wxDefaultValidator,
              const wxString& name = wxButtonNameStr)
     {
@@ -84,7 +78,7 @@ public:
                 const wxString& label = wxEmptyString,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
-                long style = 0,
+                long style = wxBORDER_NONE,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxButtonNameStr);
 
@@ -97,7 +91,6 @@ public:
 
 protected:
     virtual wxSize DoGetBestSize() const ;
-
 };
 
 #endif // _WX_OSX_BUTTON_H_