X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f4fffffc953f68af6c968419da446a9b2e536693..f1f5f16f780bb41aa2ea24ccbf728f14c86cc475:/include/wx/generic/mdig.h?ds=inline diff --git a/include/wx/generic/mdig.h b/include/wx/generic/mdig.h index 6b7ea2b6da..4ca3ba2625 100644 --- a/include/wx/generic/mdig.h +++ b/include/wx/generic/mdig.h @@ -12,10 +12,6 @@ #ifndef _WX_MDIG_H_ #define _WX_MDIG_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "mdig.h" -#endif - // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- @@ -24,8 +20,7 @@ #include "wx/panel.h" #include "wx/notebook.h" -extern WXDLLEXPORT_DATA(const wxChar*) wxFrameNameStr; -extern WXDLLEXPORT_DATA(const wxChar*) wxStatusLineNameStr; +extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[]; //----------------------------------------------------------------------------- @@ -52,7 +47,7 @@ public: long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL, const wxString& name = wxFrameNameStr); - ~wxGenericMDIParentFrame(); + virtual ~wxGenericMDIParentFrame(); bool Create( wxWindow *parent, wxWindowID winid, const wxString& title, @@ -79,7 +74,7 @@ public: virtual wxGenericMDIClientWindow *OnCreateClient(); virtual void Cascade() { /* Has no effect */ } - virtual void Tile() { /* Has no effect */ } + virtual void Tile(wxOrientation WXUNUSED(orient) = wxHORIZONTAL) { } virtual void ArrangeIcons() { /* Has no effect */ } virtual void ActivateNext(); virtual void ActivatePrevious(); @@ -234,7 +229,7 @@ class WXDLLEXPORT wxGenericMDIClientWindow: public wxNotebook public: wxGenericMDIClientWindow(); wxGenericMDIClientWindow( wxGenericMDIParentFrame *parent, long style = 0 ); - ~wxGenericMDIClientWindow(); + virtual ~wxGenericMDIClientWindow(); virtual bool CreateClient( wxGenericMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL ); virtual int SetSelection(size_t nPage);