added wxGetX11Display() returning the pointer of the correct type, unlike the old...

[wxWidgets.git] / include / wx / gtk / mdi.h

diff --git a/include/wx/gtk/mdi.h b/include/wx/gtk/mdi.h
index 0fca26b942e6bf67a2b86b60db88439d0bf0eb21..5ce91c006ead8aba9612d38f33bf0c0b7bea5620 100644 (file)
--- 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,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;
 
@@ -135,8 +133,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 +148,8 @@ public:
 
     virtual bool IsTopLevel() const { return false; }
 
+    virtual bool Destroy();
+
     void OnActivate( wxActivateEvent& event );
     void OnMenuHighlight( wxMenuEvent& event );
 
@@ -183,7 +181,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: