Wine fixes

[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 ffb0bcd288f30ff962c2f161a8b87bbc5db52bcf..b50b7160b649d7595d57a66c07fb0bbab0a78e66 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


@@ -53,10 +49,16 @@ public:
 
     virtual ~wxTopLevelWindowMac();
 
 
     virtual ~wxTopLevelWindowMac();
 

+    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 ) ); }


@@ -64,9 +66,12 @@ public:
 
     virtual bool SetShape(const wxRegion& region);
 
 
     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();
+

 
     // implementation from now on
     // --------------------------
 
     // implementation from now on
     // --------------------------


@@ -77,70 +82,69 @@ public:
                                       const wxSize& size,
                                       long style,
                                       const wxString& name ) ;
                                       const wxSize& size,
                                       long style,
                                       const wxString& name ) ;

-    static WXWindow MacGetWindowInUpdate() { return s_macWindowInUpdate ; }
-    virtual void MacGetPortParams(WXPOINTPTR localOrigin, WXRECTPTR clipRect, WXWindow *window , wxWindowMac** rootwin ) ;

     virtual void ClearBackground() ;
     virtual void ClearBackground() ;

-    virtual WXWidget MacGetContainerForEmbedding() ;
+

     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 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 ) ;
-#endif
-    virtual void MacFireMouseEvent( wxUint16 kind , wxInt32 x , wxInt32 y ,wxUint32 modifiers , long timestamp ) ;
+    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 void DoMoveWindow(int x, int y, int width, int height);
-    void MacInvalidate( const WXRECTPTR rect, bool eraseBackground ) ;
-    short MacGetWindowBackgroundTheme() const { return m_macWindowBackgroundTheme ; }
-    static bool MacEnableCompositing( bool useCompositing ); 
-    bool MacUsesCompositing() { return m_macUsesCompositing; } 
+    virtual bool Show( bool show = true );
+
+    virtual void SetExtraStyle(long exStyle) ;
+
+    virtual void MacSetBackgroundBrush( const wxBrush &brush ) ;
+
+    virtual void MacInstallTopLevelWindowEventHandler() ;
+
+    bool MacGetMetalAppearance() const ;
+
+    void MacChangeWindowAttributes( wxUint32 attributesToSet , wxUint32 attributesToClear ) ;
+    wxUint32 MacGetWindowAttributes() const ;

 
 

-#if TARGET_CARBON

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

-#endif
+
+    virtual void        MacGetContentAreaInset( int &left , int &top , int &right , int &bottom ) ;
+

 protected:
     // common part of all ctors
     void Init();
 
 protected:
     // common part of all ctors
     void Init();
 

+    virtual void DoGetPosition( int *x, int *y ) 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;
+

     // is the frame currently iconized?
     bool m_iconized;
 
     // 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;
     // is the frame currently iconized?
     bool m_iconized;
 
     // 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 ;
-
-    short m_macWindowBackgroundTheme ;
+ 

     WXWindow m_macWindow ;
     WXWindow m_macWindow ;

-    WXWidget m_macRootControl ;
+

     wxWindowMac* m_macFocus ;
     wxWindowMac* m_macFocus ;

-    WXHRGN m_macNoEraseUpdateRgn ;
-    bool m_macNeedsErasing ;
+    void *m_macFullScreenData ;

 
 

-    static WXWindow s_macWindowInUpdate ;

     static wxTopLevelWindowMac *s_macDeactivateWindow;
     static wxTopLevelWindowMac *s_macDeactivateWindow;

-    static bool s_macWindowCompositing ;

 private :
 private :

-#if TARGET_CARBON
+    // 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 ;
     WXEVENTHANDLERREF    m_macEventHandler ;

-#endif
+
+    DECLARE_EVENT_TABLE()

 };
 
 // list of all frames and modeless dialogs
 extern WXDLLEXPORT_DATA(wxWindowList) wxModelessWindows;
 
 };
 
 // list of all frames and modeless dialogs
 extern WXDLLEXPORT_DATA(wxWindowList) wxModelessWindows;
 

-// associate mac windows with wx counterparts
-
-wxTopLevelWindowMac* wxFindWinFromMacWindow( WXWindow inWindow ) ;
-void wxAssociateWinWithMacWindow(WXWindow inWindow, wxTopLevelWindowMac *win) ;
-void wxRemoveMacWindowAssociation(wxTopLevelWindowMac *win) ;
-
-

 #endif // _WX_MSW_TOPLEVEL_H_
 #endif // _WX_MSW_TOPLEVEL_H_

-