X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b38dc31ffa6eb372727a7b0e65001a1c3d107fcb..7344108e8a129a3f9b4df5ab0f98a1713db03b89:/include/wx/osx/button.h

diff --git a/include/wx/osx/button.h b/include/wx/osx/button.h
index 8959d9b142..602644fe2c 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);
@@ -52,32 +50,7 @@ public:
     virtual bool        OSXHandleClicked( double timestampsec );
 
 protected:
-    virtual wxSize DoGetBestSize() const ;
-
-    void OnEnterWindow( wxMouseEvent& event);
-    void OnLeaveWindow( wxMouseEvent& event);
-    
-    virtual wxBitmap DoGetBitmap(State which) const;
-    virtual void DoSetBitmap(const wxBitmap& bitmap, State which);
-    virtual void DoSetBitmapPosition(wxDirection dir);
-
-    virtual void DoSetBitmapMargins(int x, int y)
-    {
-        m_marginX = x;
-        m_marginY = y;
-    }
-    
-    // the margins around the bitmap
-    int m_marginX;
-    int m_marginY;
-
-    // the bitmaps for the different state of the buttons, all of them may be
-    // invalid and the button only shows a bitmap at all if State_Normal bitmap
-    // is valid
-    wxBitmap m_bitmaps[State_Max];    
-    
     DECLARE_DYNAMIC_CLASS(wxButton)
-    DECLARE_EVENT_TABLE()
 };
 
 // OS X specific class, not part of public wx API
@@ -89,7 +62,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)
     {
@@ -101,7 +74,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);