fixed memory leak in wxXmlResource introduced when fixing wxVector<> usage (patch...

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

diff --git a/include/wx/gtk/mdi.h b/include/wx/gtk/mdi.h
index 19a09ac5aa3d01692889c0659830fd367f81bde3..53a3cdecebb9a69067e6b8164d8cad90338749ba 100644 (file)
--- a/include/wx/gtk/mdi.h
+++ b/include/wx/gtk/mdi.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        gtk/mdi.h
+// Name:        wx/gtk/mdi.h

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -7,31 +7,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __MDIH__
-#define __MDIH__
+#ifndef _WX_GTK_MDI_H_
+#define _WX_GTK_MDI_H_

 
 

-#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/frame.h"

-#include "wx/toolbar.h"

 
 

-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxMDIParentFrame;
-class WXDLLIMPEXP_CORE wxMDIClientWindow;
-class WXDLLIMPEXP_CORE wxMDIChildFrame;
-
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern WXDLLIMPEXP_CORE const wxChar* wxFrameNameStr;
-extern WXDLLIMPEXP_CORE const wxChar* wxStatusLineNameStr;
+class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame;
+class WXDLLIMPEXP_FWD_CORE wxMDIClientWindow;

 
 //-----------------------------------------------------------------------------
 // wxMDIParentFrame
 
 //-----------------------------------------------------------------------------
 // wxMDIParentFrame


@@ -54,7 +36,7 @@ public:
         (void)Create(parent, id, title, pos, size, style, name);
     }
 
         (void)Create(parent, id, title, pos, size, style, name);
     }
 

-    ~wxMDIParentFrame();
+    virtual ~wxMDIParentFrame();

     bool Create( wxWindow *parent,
                  wxWindowID id,
                  const wxString& title,
     bool Create( wxWindow *parent,
                  wxWindowID id,
                  const wxString& title,


@@ -79,13 +61,11 @@ public:
     wxMDIClientWindow  *m_clientWindow;
     bool                m_justInserted;
 
     wxMDIClientWindow  *m_clientWindow;
     bool                m_justInserted;
 

-    virtual void GtkOnSize( int x, int y, int width, int height );

     virtual void OnInternalIdle();
 
 protected:
     void Init();
     virtual void OnInternalIdle();
 
 protected:
     void Init();

-
-    virtual void DoGetClientSize(int *width, int *height) const;
+    virtual void DoGetClientSize(int* width, int* height) const;

 
 private:
     friend class wxMDIChildFrame;
 
 private:
     friend class wxMDIChildFrame;


@@ -138,14 +118,6 @@ public:
     virtual void SetStatusWidths( int WXUNUSED(n), const int WXUNUSED(widths_field)[] ) {}
 #endif
 
     virtual void SetStatusWidths( int WXUNUSED(n), const int WXUNUSED(widths_field)[] ) {}
 #endif
 

-    // no size hints
-    virtual void DoSetSizeHints( int WXUNUSED(minW),
-                               int WXUNUSED(minH),
-                               int WXUNUSED(maxW) = -1,
-                               int WXUNUSED(maxH) = -1,
-                               int WXUNUSED(incW) = -1,
-                               int WXUNUSED(incH) = -1) {}
-

 #if wxUSE_TOOLBAR
     // no toolbar
     virtual wxToolBar* CreateToolBar( long WXUNUSED(style),
 #if wxUSE_TOOLBAR
     // no toolbar
     virtual wxToolBar* CreateToolBar( long WXUNUSED(style),


@@ -156,14 +128,11 @@ public:
 #endif // wxUSE_TOOLBAR
 
     // no icon
 #endif // wxUSE_TOOLBAR
 
     // no icon

-    virtual void SetIcon(const wxIcon& icon)
-        { wxTopLevelWindowBase::SetIcon(icon); }

     virtual void SetIcons(const wxIconBundle& icons )
         { wxTopLevelWindowBase::SetIcons(icons); }
 
     // no title
     virtual void SetIcons(const wxIconBundle& icons )
         { wxTopLevelWindowBase::SetIcons(icons); }
 
     // no title

-    void SetTitle( const wxString &title );
-    wxString GetTitle() const { return m_title; }
+    virtual void SetTitle( const wxString &title );

 
     // no maximize etc
     virtual void Maximize( bool WXUNUSED(maximize) = true ) { }
 
     // no maximize etc
     virtual void Maximize( bool WXUNUSED(maximize) = true ) { }


@@ -174,6 +143,8 @@ public:
 
     virtual bool IsTopLevel() const { return false; }
 
 
     virtual bool IsTopLevel() const { return false; }
 

+    virtual bool Destroy();
+

     void OnActivate( wxActivateEvent& event );
     void OnMenuHighlight( wxMenuEvent& event );
 
     void OnActivate( wxActivateEvent& event );
     void OnMenuHighlight( wxMenuEvent& event );
 


@@ -188,8 +159,11 @@ protected:
     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
     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;
+
+    // no size hints
+    virtual void DoSetSizeHints(int WXUNUSED(minW), int WXUNUSED(minH),
+                                int WXUNUSED(maxW), int WXUNUSED(maxH),
+                                int WXUNUSED(incW), int WXUNUSED(incH)) {}

 
 private:
     DECLARE_EVENT_TABLE()
 
 private:
     DECLARE_EVENT_TABLE()


@@ -205,12 +179,11 @@ class WXDLLIMPEXP_CORE wxMDIClientWindow: public wxWindow
 public:
     wxMDIClientWindow();
     wxMDIClientWindow( wxMDIParentFrame *parent, long style = 0 );
 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)
 };
 
     virtual bool CreateClient( wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL );
 
 private:
     DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)
 };
 

-#endif // __MDIH__
-
+#endif // _WX_GTK_MDI_H_