X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0416c41834f36316a03720c4ed05cdf36964a2f3..fbda518cb73c410f88838b8f9df3e525720106a6:/include/wx/gtk/mdi.h diff --git a/include/wx/gtk/mdi.h b/include/wx/gtk/mdi.h index 0fca26b942..978b1abe86 100644 --- a/include/wx/gtk/mdi.h +++ b/include/wx/gtk/mdi.h @@ -33,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, @@ -58,13 +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; + virtual bool HasVisibleMenubar() const; private: friend class wxMDIChildFrame; @@ -135,8 +134,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); } @@ -152,6 +149,8 @@ public: virtual bool IsTopLevel() const { return false; } + virtual bool Destroy(); + void OnActivate( wxActivateEvent& event ); void OnMenuHighlight( wxMenuEvent& event ); @@ -166,8 +165,6 @@ protected: virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO); - virtual void DoSetClientSize(int width, int height); - virtual void DoGetClientSize( int *width, int *height ) const; private: DECLARE_EVENT_TABLE() @@ -183,7 +180,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: