removed InitBase()

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

diff --git a/include/wx/mac/toplevel.h b/include/wx/mac/toplevel.h
index f101e5626d88db7549c0aa24e88bc5fe54075868..7fd6551dc15b335c38ecba2655d5ae1e4493efe0 100644 (file)
--- a/include/wx/mac/toplevel.h
+++ b/include/wx/mac/toplevel.h
@@ -1,18 +1,18 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        wx/mac/toplevel.h
 // Purpose:     wxTopLevelWindowMac is the Mac implementation of wxTLW
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        wx/mac/toplevel.h
 // Purpose:     wxTopLevelWindowMac is the Mac implementation of wxTLW

-// Author:      Vadim Zeitlin
+// Author:      Stefan Csomor

 // Modified by:
 // Created:     20.09.01
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     20.09.01
 // RCS-ID:      $Id$

-// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
+// Copyright:   (c) 2001 Stefan Csomor

 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MSW_TOPLEVEL_H_
 #define _WX_MSW_TOPLEVEL_H_
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MSW_TOPLEVEL_H_
 #define _WX_MSW_TOPLEVEL_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "toplevel.h"
 #endif
 
     #pragma interface "toplevel.h"
 #endif
 


@@ -58,6 +58,8 @@ public:
     virtual void SetIcons(const wxIconBundle& icons) { SetIcon( icons.GetIcon( -1 ) ); }
     virtual void Restore();
 
     virtual void SetIcons(const wxIconBundle& icons) { SetIcon( icons.GetIcon( -1 ) ); }
     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 WXUNUSED(show), long WXUNUSED(style) = wxFULLSCREEN_ALL)
     { return FALSE; }
     virtual bool IsFullScreen() const { return FALSE; }


@@ -65,6 +67,7 @@ public:
     // implementation from now on
     // --------------------------
 
     // implementation from now on
     // --------------------------
 

+    static void MacDelayedDeactivation(long timestamp);

     virtual void MacCreateRealWindow( const wxString& title,
                                       const wxPoint& pos,
                                       const wxSize& size,
     virtual void MacCreateRealWindow( const wxString& title,
                                       const wxPoint& pos,
                                       const wxSize& size,


@@ -72,7 +75,7 @@ public:
                                       const wxString& name ) ;
     static WXWindow MacGetWindowInUpdate() { return s_macWindowInUpdate ; }
     virtual void MacGetPortParams(WXPOINTPTR localOrigin, WXRECTPTR clipRect, WXWindow *window , wxWindowMac** rootwin ) ;
                                       const wxString& name ) ;
     static WXWindow MacGetWindowInUpdate() { return s_macWindowInUpdate ; }
     virtual void MacGetPortParams(WXPOINTPTR localOrigin, WXRECTPTR clipRect, WXWindow *window , wxWindowMac** rootwin ) ;

-    virtual void Clear() ;
+    virtual void ClearBackground() ;

     virtual WXWidget MacGetContainerForEmbedding() ;
     WXWindow MacGetWindowRef() { return m_macWindow ; }
     virtual void MacActivate( long timestamp , bool inIsActivating ) ;
     virtual WXWidget MacGetContainerForEmbedding() ;
     WXWindow MacGetWindowRef() { return m_macWindow ; }
     virtual void MacActivate( long timestamp , bool inIsActivating ) ;


@@ -93,7 +96,7 @@ public:
     short MacGetWindowBackgroundTheme() const { return m_macWindowBackgroundTheme ; }
 
 #if TARGET_CARBON
     short MacGetWindowBackgroundTheme() const { return m_macWindowBackgroundTheme ; }
 
 #if TARGET_CARBON

-       WXEVENTHANDLERREF       MacGetEventHandler() { return m_macEventHandler ; }
+    WXEVENTHANDLERREF    MacGetEventHandler() { return m_macEventHandler ; }

 #endif
 protected:
     // common part of all ctors
 #endif
 protected:
     // common part of all ctors


@@ -114,9 +117,10 @@ protected:
     bool m_macNeedsErasing ;
 
     static WXWindow s_macWindowInUpdate ;
     bool m_macNeedsErasing ;
 
     static WXWindow s_macWindowInUpdate ;

+    static wxTopLevelWindowMac *s_macDeactivateWindow;

 private :
 #if TARGET_CARBON
 private :
 #if TARGET_CARBON

-       WXEVENTHANDLERREF       m_macEventHandler ;
+    WXEVENTHANDLERREF    m_macEventHandler ;

 #endif
 };
 
 #endif
 };