X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/10816efb2cb6561a227a87de6d5f8b5750c2705d..f60ca3e24c9c09f3053310807b9e4dab8a613578:/include/wx/msw/mdi.h?ds=sidebyside diff --git a/include/wx/msw/mdi.h b/include/wx/msw/mdi.h index 3b9c41387e..a0cbee8804 100644 --- a/include/wx/msw/mdi.h +++ b/include/wx/msw/mdi.h @@ -14,16 +14,16 @@ #include "wx/frame.h" -extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxStatusLineNameStr[]; -class WXDLLEXPORT wxMDIClientWindow; -class WXDLLEXPORT wxMDIChildFrame; +class WXDLLIMPEXP_FWD_CORE wxMDIClientWindow; +class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame; // --------------------------------------------------------------------------- // wxMDIParentFrame // --------------------------------------------------------------------------- -class WXDLLEXPORT wxMDIParentFrame : public wxFrame +class WXDLLIMPEXP_CORE wxMDIParentFrame : public wxFrame { public: wxMDIParentFrame(); @@ -114,7 +114,7 @@ protected: bool m_parentFrameActive; private: - friend class WXDLLEXPORT wxMDIChildFrame; + friend class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame; DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS(wxMDIParentFrame) @@ -125,7 +125,7 @@ private: // wxMDIChildFrame // --------------------------------------------------------------------------- -class WXDLLEXPORT wxMDIChildFrame : public wxFrame +class WXDLLIMPEXP_CORE wxMDIChildFrame : public wxFrame { public: wxMDIChildFrame() { Init(); } @@ -162,6 +162,11 @@ public: // Implementation only from now on // ------------------------------- + wxMDIParentFrame* GetMDIParent() const + { + return wxStaticCast(wxFrame::GetParent(), wxMDIParentFrame); + } + // Handlers bool HandleMDIActivate(long bActivate, WXHWND, WXHWND); bool HandleWindowPosChanging(void *lpPos); @@ -205,7 +210,7 @@ private: // wxMDIClientWindow // --------------------------------------------------------------------------- -class WXDLLEXPORT wxMDIClientWindow : public wxWindow +class WXDLLIMPEXP_CORE wxMDIClientWindow : public wxWindow { public: wxMDIClientWindow() { Init(); }