add support for asynchronous execution in wxBase (patch 1906889)

[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 71a5f1937cd1598a6b156ea8a993ad2df0d81d23..dd7c539bfc58650ad446c8031899c1d89c275729 100644 (file)
--- a/include/wx/mac/carbon/toplevel.h
+++ b/include/wx/mac/carbon/toplevel.h
@@ -94,10 +94,18 @@ public:
     virtual void Lower();
     virtual bool Show( bool show = true );
 
     virtual void Lower();
     virtual bool Show( bool show = true );
 

+    virtual bool ShowWithEffect(wxShowEffect effect,
+                                unsigned timeout = 0,
+                                wxDirection dir = wxBOTTOM);
+   
+    virtual bool HideWithEffect(wxShowEffect effect,
+                                unsigned timeout = 0,
+                                wxDirection dir = wxBOTTOM);
+     

     virtual void SetExtraStyle(long exStyle) ;
 
     virtual void SetExtraStyle(long exStyle) ;
 

-    virtual void MacSetBackgroundBrush( const wxBrush &brush ) ;
-
+    virtual bool SetBackgroundColour( const wxColour &colour );
+    

     virtual void MacInstallTopLevelWindowEventHandler() ;
 
     bool MacGetMetalAppearance() const ;
     virtual void MacInstallTopLevelWindowEventHandler() ;
 
     bool MacGetMetalAppearance() const ;


@@ -118,6 +126,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;


@@ -125,7 +134,7 @@ 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;

- 
+

     WXWindow m_macWindow ;
 
     wxWindowMac* m_macFocus ;
     WXWindow m_macWindow ;
 
     wxWindowMac* m_macFocus ;


@@ -139,6 +148,12 @@ private :
     // logic & checks cease to work as expected. To set the metal appearance, use SetExtraStyle.
     void MacSetMetalAppearance( bool on ) ;
     void MacSetUnifiedAppearance( bool on ) ;
     // 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 ;
 
 
     WXEVENTHANDLERREF    m_macEventHandler ;