X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fd39f7a893223741e579c5292b825a5c966a4170..29825f5fc4639b5aa86902cb4b1cd4fa07fb3593:/include/wx/mac/carbon/window.h diff --git a/include/wx/mac/carbon/window.h b/include/wx/mac/carbon/window.h index 16d5cfc663..097890bf33 100644 --- a/include/wx/mac/carbon/window.h +++ b/include/wx/mac/carbon/window.h @@ -55,7 +55,8 @@ public: virtual void Lower(); virtual bool Show( bool show = true ); - virtual bool Enable( bool enable = true ); + virtual void DoEnable( bool enable ); + virtual void OnEnabled( bool enabled ); virtual void SetFocus(); @@ -126,11 +127,6 @@ public: virtual bool CanSetTransparent(); virtual wxByte GetTransparent() const ; -#if WXWIN_COMPATIBILITY_2_4 - bool GetTransparentBackground() const { return m_backgroundTransparent; } - void SetTransparent(bool t = true) { m_backgroundTransparent = t; } -#endif - // event handlers // -------------- void OnSetFocus( wxFocusEvent& event ); @@ -315,13 +311,8 @@ protected: void MacUpdateControlFont() ; void MacPropagateVisibilityChanged() ; - void MacPropagateEnabledStateChanged() ; void MacPropagateHiliteChanged() ; -#if WXWIN_COMPATIBILITY_2_4 - bool m_backgroundTransparent ; -#endif - // implement the base class pure virtuals virtual wxSize DoGetBestSize() const; virtual wxSize DoGetSizeFromClientSize( const wxSize & size ) const;