X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b2e10daccc99be6d3ca7a206c69e94d3bfe6b03d..4f2511d706e5274a34e1521e11c1b95fed735b42:/include/wx/generic/mdig.h diff --git a/include/wx/generic/mdig.h b/include/wx/generic/mdig.h index 11f75518b6..bee3506d09 100644 --- a/include/wx/generic/mdig.h +++ b/include/wx/generic/mdig.h @@ -20,7 +20,10 @@ #include "wx/panel.h" #include "wx/notebook.h" -extern WXDLLEXPORT_DATA(const char) wxStatusLineNameStr[]; +class WXDLLIMPEXP_FWD_CORE wxIcon; +class WXDLLIMPEXP_FWD_CORE wxIconBundle; + +extern WXDLLIMPEXP_DATA_CORE(const char) wxStatusLineNameStr[]; //----------------------------------------------------------------------------- @@ -35,7 +38,7 @@ class WXDLLIMPEXP_FWD_CORE wxGenericMDIChildFrame; // wxGenericMDIParentFrame //----------------------------------------------------------------------------- -class WXDLLEXPORT wxGenericMDIParentFrame: public wxFrame +class WXDLLIMPEXP_CORE wxGenericMDIParentFrame: public wxFrame { public: wxGenericMDIParentFrame(); @@ -108,7 +111,7 @@ private: // wxGenericMDIChildFrame //----------------------------------------------------------------------------- -class WXDLLEXPORT wxGenericMDIChildFrame: public wxPanel +class WXDLLIMPEXP_CORE wxGenericMDIChildFrame: public wxPanel { public: wxGenericMDIChildFrame(); @@ -162,6 +165,7 @@ public: #endif // no icon + void SetIcon(const wxIcon& WXUNUSED(icon)) { } virtual void SetIcons( const wxIconBundle& WXUNUSED(icons) ) { } // no maximize etc @@ -220,7 +224,7 @@ private: // wxGenericMDIClientWindow //----------------------------------------------------------------------------- -class WXDLLEXPORT wxGenericMDIClientWindow: public wxNotebook +class WXDLLIMPEXP_CORE wxGenericMDIClientWindow: public wxNotebook { public: wxGenericMDIClientWindow(); @@ -233,7 +237,7 @@ public: protected: void PageChanged(int OldSelection, int newSelection); - void OnPageChanged(wxNotebookEvent& event); + void OnPageChanged(wxBookCtrlEvent& event); void OnSize(wxSizeEvent& event); private: @@ -262,7 +266,7 @@ class wxMDIChildFrame ; // wxMDIParentFrame //----------------------------------------------------------------------------- -class WXDLLEXPORT wxMDIParentFrame: public wxGenericMDIParentFrame +class WXDLLIMPEXP_CORE wxMDIParentFrame: public wxGenericMDIParentFrame { public: wxMDIParentFrame() {} @@ -288,7 +292,7 @@ private: // wxMDIChildFrame //----------------------------------------------------------------------------- -class WXDLLEXPORT wxMDIChildFrame: public wxGenericMDIChildFrame +class WXDLLIMPEXP_CORE wxMDIChildFrame: public wxGenericMDIChildFrame { public: wxMDIChildFrame() {} @@ -311,7 +315,7 @@ private: // wxMDIClientWindow //----------------------------------------------------------------------------- -class WXDLLEXPORT wxMDIClientWindow: public wxGenericMDIClientWindow +class WXDLLIMPEXP_CORE wxMDIClientWindow: public wxGenericMDIClientWindow { public: wxMDIClientWindow() {}