X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..f944aec0cf131c1be0b8c127ba1ecdbc8410c9b2:/include/wx/mac/carbon/toplevel.h

diff --git a/include/wx/mac/carbon/toplevel.h b/include/wx/mac/carbon/toplevel.h
index cffc02d64a..dd7c539bfc 100644
--- a/include/wx/mac/carbon/toplevel.h
+++ b/include/wx/mac/carbon/toplevel.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mac/toplevel.h
+// Name:        wx/mac/carbon/toplevel.h
 // Purpose:     wxTopLevelWindowMac is the Mac implementation of wxTLW
 // Author:      Stefan Csomor
 // Modified by:
@@ -56,12 +56,10 @@ public:
     virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO);
 
     // implement base class pure virtuals
-    virtual void Maximize(bool maximize = TRUE);
+    virtual void Maximize(bool maximize = true);
     virtual bool IsMaximized() const;
-    virtual void Iconize(bool iconize = TRUE);
+    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,6 +67,11 @@ public:
     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) ;
     virtual bool IsFullScreen() const ;
 
+    virtual bool SetTransparent(wxByte alpha);
+    virtual bool CanSetTransparent();
+
+    virtual bool SetBackgroundStyle(wxBackgroundStyle style);
+
     // implementation from now on
     // --------------------------
 
@@ -84,18 +87,29 @@ public:
     virtual void MacActivate( long timestamp , bool inIsActivating ) ;
     virtual void MacPerformUpdates() ;
 
-    virtual void Raise();
-    virtual void Lower();
     virtual void SetTitle( const wxString& title);
-    virtual bool Show( bool show = TRUE );
+    virtual wxString GetTitle() const;
 
-    virtual void MacSetBackgroundBrush( const wxBrush &brush ) ;
-
-    bool MacUsesCompositing() { return m_macUsesCompositing; } 
+    virtual void Raise();
+    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 bool SetBackgroundColour( const wxColour &colour );
+    
     virtual void MacInstallTopLevelWindowEventHandler() ;
 
-    void MacSetMetalAppearance( bool on ) ;
     bool MacGetMetalAppearance() const ;
+    bool MacGetUnifiedAppearance() const ;
 
     void MacChangeWindowAttributes( wxUint32 attributesToSet , wxUint32 attributesToClear ) ;
     wxUint32 MacGetWindowAttributes() const ;
@@ -112,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;
@@ -119,7 +134,6 @@ 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 ;
 
@@ -128,6 +142,19 @@ protected:
 
     static wxTopLevelWindowMac *s_macDeactivateWindow;
 private :
+    // KH: We cannot let this be called directly since the metal appearance is now managed by an
+    // extra style. Calling this function directly can result in blank white window backgrounds.
+    // 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 ;
 
     DECLARE_EVENT_TABLE()
@@ -137,4 +164,3 @@ private :
 extern WXDLLEXPORT_DATA(wxWindowList) wxModelessWindows;
 
 #endif // _WX_MSW_TOPLEVEL_H_
-