Further performance optimizations

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

diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h
index 268ecbd4ad121a04f5c3501f4c59c0f3b375e4fb..ed8b2e9f5ff8ae22e1b7692f62eb63109f7798a3 100644 (file)
--- a/include/wx/toplevel.h
+++ b/include/wx/toplevel.h
@@ -20,11 +20,12 @@
 
 #include "wx/nonownedwnd.h"
 #include "wx/iconbndl.h"
+#include "wx/containr.h"
 
 // the default names for various classes
-extern WXDLLEXPORT_DATA(const wxChar) wxFrameNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxFrameNameStr[];
 
-class WXDLLEXPORT wxTopLevelWindowBase;
+class WXDLLIMPEXP_FWD_CORE wxTopLevelWindowBase;
 
 // ----------------------------------------------------------------------------
 // constants
@@ -115,7 +116,7 @@ enum
 // wxTopLevelWindow: a top level (as opposed to child) window
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxTopLevelWindowBase : public wxNonOwnedWindow
+class WXDLLIMPEXP_CORE wxTopLevelWindowBase : public wxNonOwnedWindow
 {
 public:
     // construction
@@ -206,9 +207,6 @@ public:
     // reverts to the "permanent" default as soon as this temporary default
     // item loses focus
 
-    // used to reset default if pointing to removed child
-    virtual void RemoveChild(wxWindowBase *child);
-
     // get the default item, temporary or permanent
     wxWindow *GetDefaultItem() const
         { return m_winTmpDefault ? m_winTmpDefault : m_winDefault; }
@@ -252,11 +250,6 @@ public:
     virtual void SetMinSize(const wxSize& minSize);
     virtual void SetMaxSize(const wxSize& maxSize);
 
-    // set size hints for "window manager"
-    virtual void DoSetSizeHints( int minW, int minH,
-                                 int maxW = wxDefaultCoord, int maxH = wxDefaultCoord,
-                                 int incW = wxDefaultCoord, int incH = wxDefaultCoord );
-
 protected:
     // the frame client to screen translation should take account of the
     // toolbar which may shift the origin of the client area
@@ -311,6 +304,7 @@ protected:
 
     DECLARE_NO_COPY_CLASS(wxTopLevelWindowBase)
     DECLARE_EVENT_TABLE()
+    WX_DECLARE_CONTROL_CONTAINER();
 };
 
 
@@ -354,7 +348,7 @@ protected:
     #include "wx/univ/toplevel.h"
 #else // !__WXUNIVERSAL__
     #ifdef wxTopLevelWindowNative
-        class WXDLLEXPORT wxTopLevelWindow : public wxTopLevelWindowNative
+        class WXDLLIMPEXP_CORE wxTopLevelWindow : public wxTopLevelWindowNative
         {
         public:
             // construction