X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/50f3c41d61bd9ae69f215bad923f562d509e063c..3115bfa8a41372ecfd505f22c6a0eb9abc2bc96b:/include/wx/mac/carbon/toplevel.h diff --git a/include/wx/mac/carbon/toplevel.h b/include/wx/mac/carbon/toplevel.h index cdffba933f..b123748caa 100644 --- a/include/wx/mac/carbon/toplevel.h +++ b/include/wx/mac/carbon/toplevel.h @@ -60,8 +60,6 @@ public: virtual bool IsMaximized() const; virtual void Iconize(bool iconize = true); virtual bool IsIconized() const; - virtual void SetIcon(const wxIcon& icon); - virtual void SetIcons(const wxIconBundle& icons) { SetIcon( icons.GetIcon( -1 ) ); } virtual void Restore(); virtual bool SetShape(const wxRegion& region); @@ -69,8 +67,8 @@ public: virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) ; virtual bool IsFullScreen() const ; - virtual bool SetTranslucency(int alpha); - virtual bool CanSetTranslucency(); + virtual bool SetTransparent(wxByte alpha); + virtual bool CanSetTransparent(); // implementation from now on @@ -99,10 +97,10 @@ public: virtual void MacSetBackgroundBrush( const wxBrush &brush ) ; - bool MacUsesCompositing() { return m_macUsesCompositing; } virtual void MacInstallTopLevelWindowEventHandler() ; bool MacGetMetalAppearance() const ; + bool MacGetUnifiedAppearance() const ; void MacChangeWindowAttributes( wxUint32 attributesToSet , wxUint32 attributesToClear ) ; wxUint32 MacGetWindowAttributes() const ; @@ -126,8 +124,7 @@ protected: // should the frame be maximized when it will be shown? set by Maximize() // when it is called while the frame is hidden bool m_maximizeOnShow; - bool m_macUsesCompositing ; - + WXWindow m_macWindow ; wxWindowMac* m_macFocus ; @@ -140,6 +137,7 @@ private : // This is because the ExtraStyle flags get out of sync with the metal appearance and the metal // logic & checks cease to work as expected. To set the metal appearance, use SetExtraStyle. void MacSetMetalAppearance( bool on ) ; + void MacSetUnifiedAppearance( bool on ) ; WXEVENTHANDLERREF m_macEventHandler ;