From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Fri, 9 Nov 2007 20:36:20 +0000 (+0000)
Subject: forward port from 2.8
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/eb83d250fcff394c282cc2f6b2bd98fe1b2e9f23?ds=sidebyside

forward port from 2.8

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49785 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/mac/carbon/toplevel.h b/include/wx/mac/carbon/toplevel.h
index 71a5f1937c..4184559d54 100644
--- a/include/wx/mac/carbon/toplevel.h
+++ b/include/wx/mac/carbon/toplevel.h
@@ -60,6 +60,9 @@ public:
     virtual bool IsMaximized() const;
     virtual void Iconize(bool iconize = true);
     virtual bool IsIconized() const;
+#ifndef __WXUNIVERSAL__
+    virtual void SetIcons(const wxIconBundle& icons);
+#endif
     virtual void Restore();
 
     virtual bool SetShape(const wxRegion& region);
@@ -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;
@@ -139,6 +143,12 @@ private :
     // 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 ;
 
@@ -146,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_