X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6f02a879ed7efc5fcf6328ff47a1352ec82812b7..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/include/wx/mac/carbon/mdi.h diff --git a/include/wx/mac/carbon/mdi.h b/include/wx/mac/carbon/mdi.h index 2bb1d94beb..7b2c2cda17 100644 --- a/include/wx/mac/carbon/mdi.h +++ b/include/wx/mac/carbon/mdi.h @@ -16,11 +16,10 @@ #include "wx/frame.h" -WXDLLEXPORT_DATA(extern const wxChar) wxFrameNameStr[]; -WXDLLEXPORT_DATA(extern const wxChar) wxStatusLineNameStr[]; +WXDLLEXPORT_DATA(extern const char) wxStatusLineNameStr[]; -class WXDLLEXPORT wxMDIClientWindow; -class WXDLLEXPORT wxMDIChildFrame; +class WXDLLIMPEXP_FWD_CORE wxMDIClientWindow; +class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame; class WXDLLEXPORT wxMDIParentFrame: public wxFrame { @@ -41,7 +40,7 @@ public: Create(parent, id, title, pos, size, style, name); } - ~wxMDIParentFrame(); + virtual ~wxMDIParentFrame(); bool Create(wxWindow *parent, wxWindowID id, @@ -107,7 +106,7 @@ protected: bool m_shouldBeShown; private: - friend class WXDLLEXPORT wxMDIChildFrame; + friend class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame; DECLARE_EVENT_TABLE() }; @@ -129,7 +128,7 @@ public: Create(parent, id, title, pos, size, style, name); } - ~wxMDIChildFrame(); + virtual ~wxMDIChildFrame(); bool Create(wxMDIParentFrame *parent, wxWindowID id, @@ -174,7 +173,7 @@ class WXDLLEXPORT wxMDIClientWindow: public wxWindow CreateClient(parent, style); } - ~wxMDIClientWindow(); + virtual ~wxMDIClientWindow(); // Note: this is virtual, to allow overridden behaviour. virtual bool CreateClient(wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL);