optimise startup of wxDataViewIndexListModel

[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 b50b7160b649d7595d57a66c07fb0bbab0a78e66..4184559d54f6c0a3d68a8fbbcb93421f83b0820d 100644 (file)
--- a/include/wx/mac/carbon/toplevel.h
+++ b/include/wx/mac/carbon/toplevel.h
@@ -60,8 +60,9 @@ public:
     virtual bool IsMaximized() const;
     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 ) ); }
+#ifndef __WXUNIVERSAL__
+    virtual void SetIcons(const wxIconBundle& icons);
+#endif
     virtual void Restore();
 
     virtual bool SetShape(const wxRegion& region);
@@ -72,6 +73,7 @@ public:
     virtual bool SetTransparent(wxByte alpha);
     virtual bool CanSetTransparent();
 
+    virtual bool SetBackgroundStyle(wxBackgroundStyle style);
 
     // implementation from now on
     // --------------------------
@@ -102,6 +104,7 @@ public:
     virtual void MacInstallTopLevelWindowEventHandler() ;
 
     bool MacGetMetalAppearance() const ;
+    bool MacGetUnifiedAppearance() const ;
 
     void MacChangeWindowAttributes( wxUint32 attributesToSet , wxUint32 attributesToClear ) ;
     wxUint32 MacGetWindowAttributes() const ;
@@ -118,6 +121,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 DoCentre(int dir);
 
     // is the frame currently iconized?
     bool m_iconized;
@@ -138,6 +142,13 @@ private :
     // 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 ) ;
+    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 ;
 
@@ -145,6 +156,6 @@ private :
 };
 
 // list of all frames and modeless dialogs
-extern WXDLLEXPORT_DATA(wxWindowList) wxModelessWindows;
+extern WXDLLEXPORT_DATA(wxWindowList) wxModelessWindows; 
 
 #endif // _WX_MSW_TOPLEVEL_H_