ignore warning 4535 for VC8 too as it still seems to be harmless

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

diff --git a/include/wx/gtk/mdi.h b/include/wx/gtk/mdi.h
index fc3a5fc76a8cc6f3328c5d91a44d1cbdc45413ad..051987ad7e81d73e203192783ef879edf6f504b3 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,36 +7,10 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+#ifndef _WX_GTK_MDI_H_
+#define _WX_GTK_MDI_H_

 
 

-#ifndef __MDIH__
-#define __MDIH__
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface
-#endif
-
-#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;

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


@@ -59,7 +33,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,


@@ -84,14 +58,12 @@ 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 GtkOnSize();

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

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

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


@@ -145,11 +117,11 @@ public:
 
     // no size hints
     virtual void DoSetSizeHints( int WXUNUSED(minW),
 
     // 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) {}
+                                 int WXUNUSED(minH),
+                                 int WXUNUSED(maxW) = wxDefaultCoord,
+                                 int WXUNUSED(maxH) = wxDefaultCoord,
+                                 int WXUNUSED(incW) = wxDefaultCoord,
+                                 int WXUNUSED(incH) = wxDefaultCoord) {}

 
 #if wxUSE_TOOLBAR
     // no toolbar
 
 #if wxUSE_TOOLBAR
     // no toolbar


@@ -167,8 +139,7 @@ public:
         { wxTopLevelWindowBase::SetIcons(icons); }
 
     // no title
         { 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 ) { }


@@ -179,6 +150,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 );
 


@@ -210,12 +183,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_