X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fb896a322a2ed53d393ee738765ddd3f72cee004..e27c99c7504d9168ee0ddd6043f942fd230027bc:/include/wx/cocoa/control.h diff --git a/include/wx/cocoa/control.h b/include/wx/cocoa/control.h index b543458bdb..d34e85c5d7 100644 --- a/include/wx/cocoa/control.h +++ b/include/wx/cocoa/control.h @@ -6,7 +6,7 @@ // Created: 2003/02/15 // RCS-ID: $Id: // Copyright: (c) 2003 David Elliott -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef __WX_COCOA_CONTROL_H__ @@ -59,35 +59,10 @@ public: // Calls the callback and appropriate event handlers bool ProcessCommand(wxCommandEvent& event); -#if WXWIN_COMPATIBILITY - virtual void SetButtonColour(const wxColour& WXUNUSED(col)) { } - wxColour* GetButtonColour() const { return NULL; } - - inline virtual void SetLabelFont(const wxFont& font); - inline virtual void SetButtonFont(const wxFont& font); - inline wxFont& GetLabelFont() const; - inline wxFont& GetButtonFont() const; - - // Adds callback - inline void Callback(const wxFunction function); - - wxFunction GetCallback() { return m_callback; } - -protected: - wxFunction m_callback; // Callback associated with the window -#endif // WXWIN_COMPATIBILITY - + // Enables the control + virtual void CocoaSetEnabled(bool enable); protected: virtual wxSize DoGetBestSize() const; }; - -#if WXWIN_COMPATIBILITY - inline void wxControl::Callback(const wxFunction f) { m_callback = f; }; - inline wxFont& wxControl::GetLabelFont() const { return GetFont(); } - inline wxFont& wxControl::GetButtonFont() const { return GetFont(); } - inline void wxControl::SetLabelFont(const wxFont& font) { SetFont(font); } - inline void wxControl::SetButtonFont(const wxFont& font) { SetFont(font); } -#endif // WXWIN_COMPATIBILITY - #endif // __WX_COCOA_CONTROL_H__