X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12028905135250524409f1e7b9bfa9c55e5ce16b..fd928524917cb25b0bf016c6f24dfb85de527a3e:/include/wx/mac/control.h diff --git a/include/wx/mac/control.h b/include/wx/mac/control.h index 148c8e7297..cc588f3861 100644 --- a/include/wx/mac/control.h +++ b/include/wx/mac/control.h @@ -57,7 +57,8 @@ public: virtual bool Enable(bool enable = TRUE) ; virtual bool Show(bool show = TRUE) ; - + virtual void DoSetWindowVariant( wxWindowVariant variant ) ; + virtual void MacRedrawControl () ; virtual void MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ; virtual void MacPreControlCreate( wxWindow *parent, wxWindowID id, wxString label , @@ -84,16 +85,6 @@ public: virtual void Refresh(bool eraseBack = TRUE, const wxRect *rect = NULL) ; WXWidget GetMacControl() { return m_macControl ;} -#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; -#endif // WXWIN_COMPATIBILITY - protected: // For controls like radiobuttons which are really composite WXWidget m_macControl ; @@ -110,13 +101,6 @@ private: }; -#if WXWIN_COMPATIBILITY - 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 - wxControl *wxFindControlFromMacControl(WXWidget inControl ) ; void wxAssociateControlWithMacControl(WXWidget inControl, wxControl *control) ; void wxRemoveMacControlAssociation(wxControl *control) ;