wxGraphicsRenderer::CreateContextFromImage is not static

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

diff --git a/include/wx/osx/button.h b/include/wx/osx/button.h
index 1d0353ef87a3d5712f493dfd0468d83c05d0d758..602644fe2c8cc9d29d0456ccc843e060f244b62d 100644 (file)
--- 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:
 // Purpose:     wxButton class
 // Author:      Stefan Csomor
 // Modified by:


@@ -41,8 +41,6 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxButtonNameStr);
 
                 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);
     virtual void SetLabel(const wxString& label);
     virtual wxWindow *SetDefault();
     virtual void Command(wxCommandEvent& event);


@@ -52,38 +50,7 @@ public:
     virtual bool        OSXHandleClicked( double timestampsec );
 
 protected:
     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;
-        InvalidateBestSize();
-    }
-
-#if wxUSE_MARKUP && wxOSX_USE_COCOA
-    virtual bool DoSetLabelMarkup(const wxString& markup);
-#endif // wxUSE_MARKUP && wxOSX_USE_COCOA
-
-
-    // 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_DYNAMIC_CLASS(wxButton)

-    DECLARE_EVENT_TABLE()

 };
 
 // OS X specific class, not part of public wx API
 };
 
 // OS X specific class, not part of public wx API