A little different fix for how to delay the call to __wxCleanup

[wxWidgets.git] / include / wx / toplevel.h

diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h
index 32ac5db2bfa495b5a190bf99ab1ea7b96d23c484..f5a64871b74ce58cc6604a974d351416bf2b016b 100644 (file)
--- a/include/wx/toplevel.h
+++ b/include/wx/toplevel.h
@@ -53,18 +53,6 @@ enum
                                wxFULLSCREEN_NOCAPTION
 };
 
-// Flags for interactive frame manipulation functions (only in wxUniversal):
-enum
-{
-    wxINTERACTIVE_MOVE           = 0x00000001,
-    wxINTERACTIVE_RESIZE         = 0x00000002,
-    wxINTERACTIVE_RESIZE_S       = 0x00000010,
-    wxINTERACTIVE_RESIZE_N       = 0x00000020,
-    wxINTERACTIVE_RESIZE_W       = 0x00000040,
-    wxINTERACTIVE_RESIZE_E       = 0x00000080,
-    wxINTERACTIVE_WAIT_FOR_INPUT = 0x10000000
-};
-
 // ----------------------------------------------------------------------------
 // wxTopLevelWindow: a top level (as opposed to child) window
 // ----------------------------------------------------------------------------
@@ -74,10 +62,7 @@ class WXDLLEXPORT wxTopLevelWindowBase : public wxWindow
 public:
     // construction
     wxTopLevelWindowBase();
-
-#ifdef __DARWIN__
-    virtual ~wxTopLevelWindowBase() {}
-#endif
+    virtual ~wxTopLevelWindowBase();
 
     // top level wnd state
     // --------------------
@@ -122,12 +107,6 @@ public:
     bool Iconized() const { return IsIconized(); }
 #endif // WXWIN_COMPATIBILITY_2
 
-
-#ifdef __WXUNIVERSAL__
-    // move/resize the frame interactively, i.e. let the user do it
-    virtual void InteractiveMove(int flags = wxINTERACTIVE_MOVE);
-#endif
-
     // implementation only from now on
     // -------------------------------
 
@@ -143,11 +122,6 @@ public:
     // so should be there for all platforms
     void OnActivate(wxActivateEvent &WXUNUSED(event)) { }
 
-#ifdef __WXPM__
-    // because of OS/2's backwards coordinate system we need something
-    // to call to position child windows anytime we get resized.
-    virtual void AlterChildPos(void) = 0; // OS/2 child control positioning
-#endif
 protected:
     // the frame client to screen translation should take account of the
     // toolbar which may shift the origin of the client area
@@ -164,9 +138,6 @@ protected:
     // (menubar, toolbar and statusbar are excluded from automatic layout)
     virtual bool IsOneOfBars(const wxWindow *WXUNUSED(win)) const { return FALSE; }
 
-#ifdef __WXPM__
-    SWP                             m_vSwpClient;
-#endif
     DECLARE_EVENT_TABLE()
 };
 
@@ -178,6 +149,9 @@ protected:
 #elif defined(__WXGTK__)
     #include "wx/gtk/toplevel.h"
     #define wxTopLevelWindowNative wxTopLevelWindowGTK
+#elif defined(__WXX11__)
+    #include "wx/x11/toplevel.h"
+    #define wxTopLevelWindowNative wxTopLevelWindowX11
 #elif defined(__WXMGL__)
     #include "wx/mgl/toplevel.h"
     #define wxTopLevelWindowNative wxTopLevelWindowMGL