first pass of wxUniv merge - nothing works, most parts don't even compile

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-26 20:59:19 +00:00
parent aeb313f31c
commit 1e6feb95a7
409 changed files with 42065 additions and 6675 deletions
--- a/include/wx/msw/mdi.h
+++ b/include/wx/msw/mdi.h
@@ -98,11 +98,12 @@ public:
    virtual bool MSWTranslateMessage(WXMSG* msg);

 protected:
+#if wxUSE_MENUS_NATIVE
    virtual void InternalSetMenuBar();
+#endif // wxUSE_MENUS_NATIVE

    wxMDIClientWindow *             m_clientWindow;
    wxMDIChildFrame *               m_currentChild;
-//    WXHMENU                         m_windowMenu;
    wxMenu*                         m_windowMenu;

    // TRUE if MDI Frame is intercepting commands, not child