Moved deprecated code to source file (didn't compile

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

diff --git a/include/wx/generic/mdig.h b/include/wx/generic/mdig.h
index 6c34b811ca1935ad9a1b5ea5678c825883d8e1f3..bd0f0a39f004d3854e0e999cbdb1264e4e51e607 100644 (file)
--- a/include/wx/generic/mdig.h
+++ b/include/wx/generic/mdig.h
@@ -20,8 +20,7 @@
 #include "wx/panel.h"
 #include "wx/notebook.h"
 
 #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[];

 
 
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------


@@ -48,7 +47,7 @@ public:
                      long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
                      const wxString& name = wxFrameNameStr);
 
                      long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
                      const wxString& name = wxFrameNameStr);
 

-    ~wxGenericMDIParentFrame();
+    virtual ~wxGenericMDIParentFrame();

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


@@ -171,8 +170,7 @@ public:
 #endif
 
     // no icon
 #endif
 
     // no icon

-    void SetIcon( const wxIcon& WXUNUSED(icon) ) { }
-    void SetIcons( const wxIconBundle& WXUNUSED(icons) ) { }
+    virtual void SetIcons( const wxIconBundle& WXUNUSED(icons) ) { }

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


@@ -230,7 +228,7 @@ class WXDLLEXPORT wxGenericMDIClientWindow: public wxNotebook
 public:
     wxGenericMDIClientWindow();
     wxGenericMDIClientWindow( wxGenericMDIParentFrame *parent, long style = 0 );
 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);
     virtual bool CreateClient( wxGenericMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL );
 
     virtual int SetSelection(size_t nPage);