Some OS/2 updates

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

diff --git a/include/wx/msw/mdi.h b/include/wx/msw/mdi.h
index afc3847ecbddb1e68a4786b64e4d7a038803efc0..b65c21f750da78f46f78a84187368bcf995cedd7 100644 (file)
--- a/include/wx/msw/mdi.h
+++ b/include/wx/msw/mdi.h
@@ -30,8 +30,6 @@ class WXDLLEXPORT wxMDIChildFrame;
 
 class WXDLLEXPORT wxMDIParentFrame : public wxFrame
 {
 
 class WXDLLEXPORT wxMDIParentFrame : public wxFrame
 {

-    DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
-

 public:
     wxMDIParentFrame();
     wxMDIParentFrame(wxWindow *parent,
 public:
     wxMDIParentFrame();
     wxMDIParentFrame(wxWindow *parent,


@@ -98,11 +96,14 @@ public:
     virtual bool MSWTranslateMessage(WXMSG* msg);
 
 protected:
     virtual bool MSWTranslateMessage(WXMSG* msg);
 
 protected:

+#if wxUSE_MENUS_NATIVE

     virtual void InternalSetMenuBar();
     virtual void InternalSetMenuBar();

+#endif // wxUSE_MENUS_NATIVE
+
+    virtual WXHICON GetDefaultIcon() const;

 
     wxMDIClientWindow *             m_clientWindow;
     wxMDIChildFrame *               m_currentChild;
 
     wxMDIClientWindow *             m_clientWindow;
     wxMDIChildFrame *               m_currentChild;

-//    WXHMENU                         m_windowMenu;

     wxMenu*                         m_windowMenu;
 
     // TRUE if MDI Frame is intercepting commands, not child
     wxMenu*                         m_windowMenu;
 
     // TRUE if MDI Frame is intercepting commands, not child


@@ -112,6 +113,7 @@ private:
     friend class WXDLLEXPORT wxMDIChildFrame;
 
     DECLARE_EVENT_TABLE()
     friend class WXDLLEXPORT wxMDIChildFrame;
 
     DECLARE_EVENT_TABLE()

+    DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)

 };
 
 // ---------------------------------------------------------------------------
 };
 
 // ---------------------------------------------------------------------------


@@ -177,6 +179,8 @@ protected:
     virtual void InternalSetMenuBar();
     virtual bool IsMDIChild() const { return TRUE; }
 
     virtual void InternalSetMenuBar();
     virtual bool IsMDIChild() const { return TRUE; }
 

+    virtual WXHICON GetDefaultIcon() const;
+

     // common part of all ctors
     void Init();
 
     // common part of all ctors
     void Init();