Implement deep copy of wxBitmapRefData

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

diff --git a/include/wx/msw/mdi.h b/include/wx/msw/mdi.h
index 393522250e58b4c6e983ae7470889f4e2edaef25..2148e5ab0a1b330f3885c49d2655f0de80b5c077 100644 (file)
--- a/include/wx/msw/mdi.h
+++ b/include/wx/msw/mdi.h
@@ -14,8 +14,7 @@
 
 #include "wx/frame.h"
 
-extern WXDLLEXPORT_DATA(const wxChar*) wxFrameNameStr;
-extern WXDLLEXPORT_DATA(const wxChar*) wxStatusLineNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[];
 
 class WXDLLEXPORT wxMDIClientWindow;
 class WXDLLEXPORT wxMDIChildFrame;
@@ -39,7 +38,7 @@ public:
         Create(parent, id, title, pos, size, style, name);
     }
 
-    ~wxMDIParentFrame();
+    virtual ~wxMDIParentFrame();
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
@@ -140,7 +139,7 @@ public:
         Create(parent, id, title, pos, size, style, name);
     }
 
-    ~wxMDIChildFrame();
+    virtual ~wxMDIChildFrame();
 
     bool Create(wxMDIParentFrame *parent,
                 wxWindowID id,
@@ -183,6 +182,7 @@ protected:
     virtual void DoSetClientSize(int width, int height);
     virtual void InternalSetMenuBar();
     virtual bool IsMDIChild() const { return true; }
+    virtual void DetachMenuBar();
 
     virtual WXHICON GetDefaultIcon() const;
 
@@ -192,7 +192,6 @@ protected:
 private:
     bool m_needsInitialShow; // Show must be called in idle time after Creation
     bool m_needsResize; // flag which tells us to artificially resize the frame
-    virtual void DetachMenuBar() ;
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxMDIChildFrame)
@@ -220,10 +219,11 @@ public:
     // Explicitly call default scroll behaviour
     void OnScroll(wxScrollEvent& event);
 
+protected:
     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
-protected:
+
     void Init() { m_scrollX = m_scrollY = 0; }
 
     int m_scrollX, m_scrollY;