use wxWindowIDRef to transparently implement auto-generated ids ref-counting (slightl...

[wxWidgets.git] / include / wx / mac / carbon / mdi.h

diff --git a/include/wx/mac/carbon/mdi.h b/include/wx/mac/carbon/mdi.h
index 927194c27d7bf657dbb94f2cd99509531631d744..7b2c2cda179baf6d411ea22cf2e9fdfc5e8dcd13 100644 (file)
--- a/include/wx/mac/carbon/mdi.h
+++ b/include/wx/mac/carbon/mdi.h
@@ -14,17 +14,12 @@
 #ifndef _WX_MDI_H_
 #define _WX_MDI_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "mdi.h"
-#endif
-
 #include "wx/frame.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr;
-WXDLLEXPORT_DATA(extern const wxChar*) wxStatusLineNameStr;
+WXDLLEXPORT_DATA(extern const char) wxStatusLineNameStr[];
 
-class WXDLLEXPORT wxMDIClientWindow;
-class WXDLLEXPORT wxMDIChildFrame;
+class WXDLLIMPEXP_FWD_CORE wxMDIClientWindow;
+class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame;
 
 class WXDLLEXPORT wxMDIParentFrame: public wxFrame
 {
@@ -45,7 +40,7 @@ public:
       Create(parent, id, title, pos, size, style, name);
   }
 
-  ~wxMDIParentFrame();
+  virtual ~wxMDIParentFrame();
 
   bool Create(wxWindow *parent,
            wxWindowID id,
@@ -111,7 +106,7 @@ protected:
     bool m_shouldBeShown;
 
 private:
-    friend class WXDLLEXPORT wxMDIChildFrame;
+    friend class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame;
     DECLARE_EVENT_TABLE()
 };
 
@@ -133,7 +128,7 @@ public:
       Create(parent, id, title, pos, size, style, name);
   }
 
-  ~wxMDIChildFrame();
+  virtual ~wxMDIChildFrame();
 
   bool Create(wxMDIParentFrame *parent,
            wxWindowID id,
@@ -178,20 +173,19 @@ class WXDLLEXPORT wxMDIClientWindow: public wxWindow
       CreateClient(parent, style);
   }
 
-  ~wxMDIClientWindow();
+  virtual ~wxMDIClientWindow();
 
   // Note: this is virtual, to allow overridden behaviour.
   virtual bool CreateClient(wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL);
 
-  // Gets the size available for subwindows after menu size, toolbar size
-  // and status bar size have been subtracted. If you want to manage your own
-  // toolbar(s), don't call SetToolBar.
-  void DoGetClientSize(int *width, int *height) const;
-
   // Explicitly call default scroll behaviour
   void OnScroll(wxScrollEvent& event);
 
 protected:
+    // Gets the size available for subwindows after menu size, toolbar size
+    // and status bar size have been subtracted. If you want to manage your own
+    // toolbar(s), don't call SetToolBar.
+    void DoGetClientSize(int *width, int *height) const;
 
 DECLARE_EVENT_TABLE()
 };