X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ea098413d0e9c3f794f43826137a636e229f26f9..396197cb567090122f9f2e640d2910c2491a7c47:/include/wx/mac/carbon/toplevel.h diff --git a/include/wx/mac/carbon/toplevel.h b/include/wx/mac/carbon/toplevel.h index f66ada9000..dd7c539bfc 100644 --- a/include/wx/mac/carbon/toplevel.h +++ b/include/wx/mac/carbon/toplevel.h @@ -70,6 +70,7 @@ public: virtual bool SetTransparent(wxByte alpha); virtual bool CanSetTransparent(); + virtual bool SetBackgroundStyle(wxBackgroundStyle style); // implementation from now on // -------------------------- @@ -93,13 +94,22 @@ public: virtual void Lower(); virtual bool Show( bool show = true ); + virtual bool ShowWithEffect(wxShowEffect effect, + unsigned timeout = 0, + wxDirection dir = wxBOTTOM); + + virtual bool HideWithEffect(wxShowEffect effect, + unsigned timeout = 0, + wxDirection dir = wxBOTTOM); + virtual void SetExtraStyle(long exStyle) ; - virtual void MacSetBackgroundBrush( const wxBrush &brush ) ; - + virtual bool SetBackgroundColour( const wxColour &colour ); + virtual void MacInstallTopLevelWindowEventHandler() ; bool MacGetMetalAppearance() const ; + bool MacGetUnifiedAppearance() const ; void MacChangeWindowAttributes( wxUint32 attributesToSet , wxUint32 attributesToClear ) ; wxUint32 MacGetWindowAttributes() const ; @@ -116,6 +126,7 @@ protected: virtual void DoGetSize( int *width, int *height ) const; virtual void DoMoveWindow(int x, int y, int width, int height); virtual void DoGetClientSize(int *width, int *height) const; + virtual void DoCentre(int dir); // is the frame currently iconized? bool m_iconized; @@ -123,7 +134,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; - + WXWindow m_macWindow ; wxWindowMac* m_macFocus ; @@ -136,6 +147,13 @@ 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 ) ; + // binary compatible workaround TODO REPLACE + void DoMacCreateRealWindow( wxWindow *parent, const wxString& title, + const wxPoint& pos, + const wxSize& size, + long style, + const wxString& name ); WXEVENTHANDLERREF m_macEventHandler ;