X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/49c9d05986415e8f4f2139f112d7a320b48c07e8..93928d517b4f748fb8bdbd7e0ae5334e2e3a8562:/include/wx/toplevel.h diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h index 92fcc6b37f..ed8b2e9f5f 100644 --- 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; } @@ -306,6 +304,7 @@ protected: DECLARE_NO_COPY_CLASS(wxTopLevelWindowBase) DECLARE_EVENT_TABLE() + WX_DECLARE_CONTROL_CONTAINER(); }; @@ -349,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