X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/06bb8d923df9ce02e522c661a11ff685466067a6..438959cca892a7651634cc3a7aad4819ac49b23c:/include/wx/osx/button.h diff --git a/include/wx/osx/button.h b/include/wx/osx/button.h index 5b189fc940..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,34 +49,12 @@ 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); +#if wxOSX_USE_COCOA + void OSXUpdateAfterLabelChange(const wxString& label); +#endif - virtual void DoSetBitmapMargins(int x, int y) - { - m_marginX = x; - m_marginY = y; - InvalidateBestSize(); - } - - // 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]; - +protected: DECLARE_DYNAMIC_CLASS(wxButton) - DECLARE_EVENT_TABLE() }; // OS X specific class, not part of public wx API