mac cgcolor changes & cleanup

[wxWidgets.git] / include / wx / mac / carbon / toplevel.h

diff --git a/include/wx/mac/carbon/toplevel.h b/include/wx/mac/carbon/toplevel.h
index bf854094b97f1e2b643705ce0fdeafc60d543ce6..759ca4dd36a02dadccdb1e05660d2616378cb5c3 100644 (file)
--- 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:
 // Purpose:     wxTopLevelWindowMac is the Mac implementation of wxTLW
 // Author:      Stefan Csomor
 // Modified by:


@@ -12,10 +12,6 @@
 #ifndef _WX_MSW_TOPLEVEL_H_
 #define _WX_MSW_TOPLEVEL_H_
 
 #ifndef _WX_MSW_TOPLEVEL_H_
 #define _WX_MSW_TOPLEVEL_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "toplevel.h"
-#endif
-

 #if wxUSE_SYSTEM_OPTIONS
     #define wxMAC_WINDOW_PLAIN_TRANSITION _T("mac.window-plain-transition")
 #endif
 #if wxUSE_SYSTEM_OPTIONS
     #define wxMAC_WINDOW_PLAIN_TRANSITION _T("mac.window-plain-transition")
 #endif


@@ -55,20 +51,26 @@ public:
 
     virtual wxPoint GetClientAreaOrigin() const;
 
 
     virtual wxPoint GetClientAreaOrigin() const;
 

+    // Attracts the users attention to this window if the application is
+    // inactive (should be called when a background event occurs)
+    virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO);
+

     // implement base class pure virtuals
     // implement base class pure virtuals

-    virtual void Maximize(bool maximize = TRUE);
+    virtual void Maximize(bool maximize = true);

     virtual bool IsMaximized() const;
     virtual bool IsMaximized() const;

-    virtual void Iconize(bool iconize = TRUE);
+    virtual void Iconize(bool iconize = true);

     virtual bool IsIconized() const;
     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);
 
     virtual void Restore();
 
     virtual bool SetShape(const wxRegion& region);
 

-    virtual bool ShowFullScreen(bool WXUNUSED(show), long WXUNUSED(style) = wxFULLSCREEN_ALL)
-    { return FALSE; }
-    virtual bool IsFullScreen() const { return FALSE; }
+    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
     // --------------------------
 
     // implementation from now on
     // --------------------------


@@ -83,19 +85,23 @@ public:
 
     WXWindow MacGetWindowRef() { return m_macWindow ; }
     virtual void MacActivate( long timestamp , bool inIsActivating ) ;
 
     WXWindow MacGetWindowRef() { return m_macWindow ; }
     virtual void MacActivate( long timestamp , bool inIsActivating ) ;

+    virtual void MacPerformUpdates() ;
+
+    virtual void SetTitle( const wxString& title);
+    virtual wxString GetTitle() const;

 
     virtual void Raise();
     virtual void Lower();
 
     virtual void Raise();
     virtual void Lower();

-    virtual void SetTitle( const wxString& title);
-    virtual bool Show( bool show = TRUE );
+    virtual bool Show( bool show = true );
+
+    virtual void SetExtraStyle(long exStyle) ;

 
     virtual void MacSetBackgroundBrush( const wxBrush &brush ) ;
 
 
     virtual void MacSetBackgroundBrush( const wxBrush &brush ) ;
 

-    bool MacUsesCompositing() { return m_macUsesCompositing; } 

     virtual void MacInstallTopLevelWindowEventHandler() ;
 
     virtual void MacInstallTopLevelWindowEventHandler() ;
 

-    void MacSetMetalAppearance( bool on ) ;

     bool MacGetMetalAppearance() const ;
     bool MacGetMetalAppearance() const ;

+    bool MacGetUnifiedAppearance() const ;

 
     void MacChangeWindowAttributes( wxUint32 attributesToSet , wxUint32 attributesToClear ) ;
     wxUint32 MacGetWindowAttributes() const ;
 
     void MacChangeWindowAttributes( wxUint32 attributesToSet , wxUint32 attributesToClear ) ;
     wxUint32 MacGetWindowAttributes() const ;


@@ -112,6 +118,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 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;
 
     // is the frame currently iconized?
     bool m_iconized;


@@ -119,14 +126,27 @@ 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;
     // 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 ;
 
     WXWindow m_macWindow ;
 
     wxWindowMac* m_macFocus ;

+    void *m_macFullScreenData ;

 
     static wxTopLevelWindowMac *s_macDeactivateWindow;
 private :
 
     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()
     WXEVENTHANDLERREF    m_macEventHandler ;
 
     DECLARE_EVENT_TABLE()


@@ -136,4 +156,3 @@ private :
 extern WXDLLEXPORT_DATA(wxWindowList) wxModelessWindows;
 
 #endif // _WX_MSW_TOPLEVEL_H_
 extern WXDLLEXPORT_DATA(wxWindowList) wxModelessWindows;
 
 #endif // _WX_MSW_TOPLEVEL_H_

-