X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..687b91d266990129fbbb8c21d92fa4298b458352:/include/wx/mac/classic/mdi.h diff --git a/include/wx/mac/classic/mdi.h b/include/wx/mac/classic/mdi.h index 1e5145e7bc..d3b1aaa6b5 100644 --- a/include/wx/mac/classic/mdi.h +++ b/include/wx/mac/classic/mdi.h @@ -14,14 +14,10 @@ #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; +WXDLLEXPORT_DATA(extern const wxChar) wxFrameNameStr[]; +WXDLLEXPORT_DATA(extern const wxChar) wxStatusLineNameStr[]; class WXDLLEXPORT wxMDIClientWindow; class WXDLLEXPORT wxMDIChildFrame; @@ -44,7 +40,7 @@ public: Create(parent, id, title, pos, size, style, name); } - ~wxMDIParentFrame(); + virtual ~wxMDIParentFrame(); bool Create(wxWindow *parent, wxWindowID id, @@ -75,7 +71,7 @@ public: // MDI operations virtual void Cascade(); - virtual void Tile(); + virtual void Tile(wxOrientation WXUNUSED(orient) = wxHORIZONTAL); virtual void ArrangeIcons(); virtual void ActivateNext(); virtual void ActivatePrevious(); @@ -113,7 +109,7 @@ public: Create(parent, id, title, pos, size, style, name); } - ~wxMDIChildFrame(); + virtual ~wxMDIChildFrame(); bool Create(wxMDIParentFrame *parent, wxWindowID id, @@ -158,7 +154,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);