X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a885d89ae9c9d6ff5275cb5b1ea3087132aacf8c..9c34a216817028bc533e07873d047208a96b05a2:/include/wx/os2/mdi.h?ds=sidebyside

diff --git a/include/wx/os2/mdi.h b/include/wx/os2/mdi.h
index eaab8a9289..540fdb5528 100644
--- a/include/wx/os2/mdi.h
+++ b/include/wx/os2/mdi.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        mdi.h
+// Name:        wx/os2/mdi.h
 // Purpose:     MDI (Multiple Document Interface) classes.
 //              This doesn't have to be implemented just like Windows,
 //              it could be a tabbed design as in wxGTK.
@@ -16,17 +16,14 @@
 
 #include "wx/frame.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxFrameNameStr;
-WXDLLEXPORT_DATA(extern const char*) wxStatusLineNameStr;
+class WXDLLIMPEXP_FWD_CORE wxMDIClientWindow;
+class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame;
 
-class WXDLLEXPORT wxMDIClientWindow;
-class WXDLLEXPORT wxMDIChildFrame;
-
-class WXDLLEXPORT wxMDIParentFrame: public wxFrame
+class WXDLLIMPEXP_CORE wxMDIParentFrame: public wxFrame
 {
 DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
 
-  friend class WXDLLEXPORT wxMDIChildFrame;
+  friend class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame;
 public:
 
   wxMDIParentFrame();
@@ -41,7 +38,7 @@ public:
       Create(parent, id, title, pos, size, style, name);
   }
 
-  ~wxMDIParentFrame();
+  virtual ~wxMDIParentFrame();
 
   bool Create(wxWindow *parent,
            wxWindowID id,
@@ -64,7 +61,8 @@ public:
     // just return a new class)
     virtual wxMDIClientWindow *OnCreateClient(void);
 
-    WXHMENU GetWindowMenu() const { return m_windowMenu; }
+    wxMenu* GetWindowMenu() const { return m_windowMenu; }
+//    void    SetWindowMenu(wxMwnu* pMenu);
 
     // MDI operations
     // --------------
@@ -96,7 +94,7 @@ protected:
 
     wxMDIClientWindow *             m_clientWindow;
     wxMDIChildFrame *               m_currentChild;
-    WXHMENU                         m_windowMenu;
+    wxMenu*                         m_windowMenu;
 
     // TRUE if MDI Frame is intercepting commands, not child
     bool m_parentFrameActive;
@@ -105,7 +103,7 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
-class WXDLLEXPORT wxMDIChildFrame: public wxFrame
+class WXDLLIMPEXP_CORE wxMDIChildFrame: public wxFrame
 {
 DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
 public:
@@ -122,7 +120,7 @@ public:
       Create(parent, id, title, pos, size, style, name);
   }
 
-  ~wxMDIChildFrame();
+  virtual ~wxMDIChildFrame();
 
   bool Create(wxMDIParentFrame *parent,
            wxWindowID id,
@@ -166,7 +164,7 @@ protected:
  * of the children. Phew! So the children are sort of 'adopted'...
  */
 
-class WXDLLEXPORT wxMDIClientWindow: public wxWindow
+class WXDLLIMPEXP_CORE wxMDIClientWindow: public wxWindow
 {
   DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)