X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cb8cc2506b73a5ea51b515a41eb6ea7a5f5ad60c..8e7cb70ce34a3ba10fed3a7a708d66543eb314a6:/include/wx/gtk/mdi.h diff --git a/include/wx/gtk/mdi.h b/include/wx/gtk/mdi.h index cbfb62263f..4338c2c39f 100644 --- a/include/wx/gtk/mdi.h +++ b/include/wx/gtk/mdi.h @@ -7,31 +7,10 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __MDIH__ -#define __MDIH__ - -#include "wx/defs.h" -#include "wx/object.h" -#include "wx/list.h" -#include "wx/control.h" -#include "wx/panel.h" -#include "wx/frame.h" -#include "wx/toolbar.h" - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxMDIParentFrame; -class WXDLLIMPEXP_CORE wxMDIClientWindow; -class WXDLLIMPEXP_CORE wxMDIChildFrame; +#ifndef _WX_GTK_MDI_H_ +#define _WX_GTK_MDI_H_ -//----------------------------------------------------------------------------- -// global data -//----------------------------------------------------------------------------- - -extern WXDLLIMPEXP_CORE const wxChar* wxFrameNameStr; -extern WXDLLIMPEXP_CORE const wxChar* wxStatusLineNameStr; +#include "wx/frame.h" //----------------------------------------------------------------------------- // wxMDIParentFrame @@ -54,7 +33,7 @@ public: (void)Create(parent, id, title, pos, size, style, name); } - ~wxMDIParentFrame(); + virtual ~wxMDIParentFrame(); bool Create( wxWindow *parent, wxWindowID id, const wxString& title, @@ -79,14 +58,12 @@ public: wxMDIClientWindow *m_clientWindow; bool m_justInserted; - virtual void GtkOnSize( int x, int y, int width, int height ); + virtual void GtkOnSize(); virtual void OnInternalIdle(); protected: void Init(); - virtual void DoGetClientSize(int *width, int *height) const; - private: friend class wxMDIChildFrame; @@ -204,11 +181,11 @@ 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: DECLARE_DYNAMIC_CLASS(wxMDIClientWindow) }; -#endif // __MDIH__ +#endif // _WX_GTK_MDI_H_