X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/324eeecb3cdc9522e136af6670443148772b412a..1f0acb435592470b421b80df854fbbb08cd2853f:/include/wx/palmos/mdi.h diff --git a/include/wx/palmos/mdi.h b/include/wx/palmos/mdi.h index 5713ef4444..97bd63b30f 100644 --- a/include/wx/palmos/mdi.h +++ b/include/wx/palmos/mdi.h @@ -12,23 +12,18 @@ #ifndef _WX_MDI_H_ #define _WX_MDI_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "mdi.h" -#endif - #include "wx/frame.h" -WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxStatusLineNameStr; +WXDLLIMPEXP_DATA_CORE(extern const wxChar) 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(); @@ -43,7 +38,7 @@ public: Create(parent, id, title, pos, size, style, name); } - ~wxMDIParentFrame(); + virtual ~wxMDIParentFrame(); bool Create(wxWindow *parent, wxWindowID id, @@ -104,18 +99,18 @@ protected: bool m_parentFrameActive; private: - friend class WXDLLEXPORT wxMDIChildFrame; + friend class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame; DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS(wxMDIParentFrame) - DECLARE_NO_COPY_CLASS(wxMDIParentFrame) + wxDECLARE_NO_COPY_CLASS(wxMDIParentFrame); }; // --------------------------------------------------------------------------- // wxMDIChildFrame // --------------------------------------------------------------------------- -class WXDLLEXPORT wxMDIChildFrame : public wxFrame +class WXDLLIMPEXP_CORE wxMDIChildFrame : public wxFrame { public: wxMDIChildFrame() { Init(); } @@ -132,7 +127,7 @@ public: Create(parent, id, title, pos, size, style, name); } - ~wxMDIChildFrame(); + virtual ~wxMDIChildFrame(); bool Create(wxMDIParentFrame *parent, wxWindowID id, @@ -188,7 +183,7 @@ private: // wxMDIClientWindow // --------------------------------------------------------------------------- -class WXDLLEXPORT wxMDIClientWindow : public wxWindow +class WXDLLIMPEXP_CORE wxMDIClientWindow : public wxWindow { public: wxMDIClientWindow() { Init(); }