removed WXWIN_COMPATIBILITY_2_4 from common and wxMSW files (patch 1675546)

[wxWidgets.git] / include / wx / generic / mdig.h

diff --git a/include/wx/generic/mdig.h b/include/wx/generic/mdig.h
index 187efb98029aa29f9e338133fadfb8871a79a479..4ca3ba2625be5e8dac396087399ad77f53e685c3 100644 (file)
--- a/include/wx/generic/mdig.h
+++ b/include/wx/generic/mdig.h
@@ -12,10 +12,6 @@
 #ifndef _WX_MDIG_H_
 #define _WX_MDIG_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "mdig.h"
-#endif
-
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
@@ -24,8 +20,7 @@
 #include "wx/panel.h"
 #include "wx/notebook.h"
 
-extern WXDLLEXPORT_DATA(const wxChar*) wxFrameNameStr;
-extern WXDLLEXPORT_DATA(const wxChar*) wxStatusLineNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[];
 
 
 //-----------------------------------------------------------------------------
@@ -52,7 +47,7 @@ public:
                      long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
                      const wxString& name = wxFrameNameStr);
 
-    ~wxGenericMDIParentFrame();
+    virtual ~wxGenericMDIParentFrame();
     bool Create( wxWindow *parent,
                  wxWindowID winid,
                  const wxString& title,
@@ -234,7 +229,7 @@ class WXDLLEXPORT wxGenericMDIClientWindow: public wxNotebook
 public:
     wxGenericMDIClientWindow();
     wxGenericMDIClientWindow( wxGenericMDIParentFrame *parent, long style = 0 );
-    ~wxGenericMDIClientWindow();
+    virtual ~wxGenericMDIClientWindow();
     virtual bool CreateClient( wxGenericMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL );
 
     virtual int SetSelection(size_t nPage);