correct access for virtuals

[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 de3c083448ec9e073ec5d76103e788c9e1891b9e..9383af61c6582103d13b96c61c6021af2c0f9061 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,10 +51,14 @@ 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 void SetIcon(const wxIcon& icon);
     virtual void SetIcons(const wxIconBundle& icons) { SetIcon( icons.GetIcon( -1 ) ); }
     virtual bool IsIconized() const;
     virtual void SetIcon(const wxIcon& icon);
     virtual void SetIcons(const wxIconBundle& icons) { SetIcon( icons.GetIcon( -1 ) ); }


@@ -82,18 +82,22 @@ 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; } 
+    bool MacUsesCompositing() { return m_macUsesCompositing; }

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

-    void MacSetMetalAppearance( bool on ) ;

     bool MacGetMetalAppearance() const ;
 
     void MacChangeWindowAttributes( wxUint32 attributesToSet , wxUint32 attributesToClear ) ;
     bool MacGetMetalAppearance() const ;
 
     void MacChangeWindowAttributes( wxUint32 attributesToSet , wxUint32 attributesToClear ) ;


@@ -127,6 +131,12 @@ protected:
 
     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 ) ;
+

     WXEVENTHANDLERREF    m_macEventHandler ;
 
     DECLARE_EVENT_TABLE()
     WXEVENTHANDLERREF    m_macEventHandler ;
 
     DECLARE_EVENT_TABLE()


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

-