X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d84afea9d1ec41ee4e2ebb3bf6b87926cf5f04d1..06cc1fb991aa0b6ec8966627d3c6d6bd0ade04be:/include/wx/mac/toplevel.h

diff --git a/include/wx/mac/toplevel.h b/include/wx/mac/toplevel.h
index 8d51f95e79..182c916c03 100644
--- 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
-// Author:      Vadim Zeitlin
+// Author:      Stefan Csomor
 // 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_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "toplevel.h"
 #endif
 
@@ -58,6 +58,8 @@ public:
     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; }
@@ -75,19 +77,26 @@ public:
     virtual void Clear() ;
     virtual WXWidget MacGetContainerForEmbedding() ;
     WXWindow MacGetWindowRef() { return m_macWindow ; }
-    virtual void MacActivate( WXEVENTREF ev , bool inIsActivating ) ;
+    virtual void MacActivate( long timestamp , bool inIsActivating ) ;
     virtual void MacUpdate( long timestamp ) ;
+#if !TARGET_CARBON
     virtual void MacMouseDown( WXEVENTREF ev , short windowPart ) ;
     virtual void MacMouseUp( WXEVENTREF ev , short windowPart ) ;
     virtual void MacMouseMoved( WXEVENTREF ev , short windowPart ) ;
     virtual void MacKeyDown( WXEVENTREF ev ) ;
-    virtual void MacFireMouseEvent( WXEVENTREF ev ) ;
+#endif
+    virtual void MacFireMouseEvent( wxUint16 kind , wxInt32 x , wxInt32 y ,wxUint32 modifiers , long timestamp ) ;
     virtual void Raise();
     virtual void Lower();
     virtual void SetTitle( const wxString& title);
     virtual bool Show( bool show = TRUE );
     virtual void DoMoveWindow(int x, int y, int width, int height);
     void MacInvalidate( const WXRECTPTR rect, bool eraseBackground ) ;
+    short MacGetWindowBackgroundTheme() const { return m_macWindowBackgroundTheme ; }
+
+#if TARGET_CARBON
+    WXEVENTHANDLERREF    MacGetEventHandler() { return m_macEventHandler ; }
+#endif
 protected:
     // common part of all ctors
     void Init();
@@ -107,6 +116,10 @@ protected:
     bool m_macNeedsErasing ;
 
     static WXWindow s_macWindowInUpdate ;
+private :
+#if TARGET_CARBON
+    WXEVENTHANDLERREF    m_macEventHandler ;
+#endif
 };
 
 // list of all frames and modeless dialogs