X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cb8cc2506b73a5ea51b515a41eb6ea7a5f5ad60c..04453a9e1e53ff185f26b1979a2febe1df7c656a:/include/wx/gtk1/mdi.h?ds=sidebyside diff --git a/include/wx/gtk1/mdi.h b/include/wx/gtk1/mdi.h index cbfb62263f..abcf72f1cd 100644 --- a/include/wx/gtk1/mdi.h +++ b/include/wx/gtk1/mdi.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/mdi.h +// Name: wx/gtk1/mdi.h // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -22,16 +22,15 @@ // classes //----------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxMDIParentFrame; -class WXDLLIMPEXP_CORE wxMDIClientWindow; -class WXDLLIMPEXP_CORE wxMDIChildFrame; +class WXDLLIMPEXP_FWD_CORE wxMDIParentFrame; +class WXDLLIMPEXP_FWD_CORE wxMDIClientWindow; +class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame; //----------------------------------------------------------------------------- // global data //----------------------------------------------------------------------------- -extern WXDLLIMPEXP_CORE const wxChar* wxFrameNameStr; -extern WXDLLIMPEXP_CORE const wxChar* wxStatusLineNameStr; +extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[]; //----------------------------------------------------------------------------- // wxMDIParentFrame @@ -54,7 +53,7 @@ public: (void)Create(parent, id, title, pos, size, style, name); } - ~wxMDIParentFrame(); + virtual ~wxMDIParentFrame(); bool Create( wxWindow *parent, wxWindowID id, const wxString& title, @@ -156,8 +155,6 @@ public: #endif // wxUSE_TOOLBAR // no icon - virtual void SetIcon(const wxIcon& icon) - { wxTopLevelWindowBase::SetIcon(icon); } virtual void SetIcons(const wxIconBundle& icons ) { wxTopLevelWindowBase::SetIcons(icons); } @@ -204,7 +201,7 @@ class WXDLLIMPEXP_CORE wxMDIClientWindow: public wxWindow public: wxMDIClientWindow(); wxMDIClientWindow( wxMDIParentFrame *parent, long style = 0 ); - ~wxMDIClientWindow(); + virtual ~wxMDIClientWindow(); virtual bool CreateClient( wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL ); private: