no message

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6340 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/os2/setup.h b/include/wx/os2/setup.h
index 8132d6b0d02011b7ee54f517d3c2f8f3016c94f7..8ac9024a0981d87199884a329f97b562ea4d596f 100644 (file)
--- a/include/wx/os2/setup.h
+++ b/include/wx/os2/setup.h
@@ -26,6 +26,8 @@
 // General features
 // ----------------------------------------------------------------------------
 
+#define wxUSE_FILESYSTEM       1 // better have this is you want to compile wxHTML
+
 #define wxUSE_PCX              1 // Utilize PCX images
 
 #define wxUSE_PNM              1 // Utilize PNM images

diff --git a/include/wx/os2/setup0.h b/include/wx/os2/setup0.h
index 8132d6b0d02011b7ee54f517d3c2f8f3016c94f7..8ac9024a0981d87199884a329f97b562ea4d596f 100644 (file)
--- a/include/wx/os2/setup0.h
+++ b/include/wx/os2/setup0.h
@@ -26,6 +26,8 @@
 // General features
 // ----------------------------------------------------------------------------
 
+#define wxUSE_FILESYSTEM       1 // better have this is you want to compile wxHTML
+
 #define wxUSE_PCX              1 // Utilize PCX images
 
 #define wxUSE_PNM              1 // Utilize PNM images

diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp
index 4c15e005b44067674d5e793e1ed8d2b2370244ed..d697f9ca5d0be16d0a5b4c185179050d382732c2 100644 (file)
--- a/src/os2/frame.cpp
+++ b/src/os2/frame.cpp
@@ -527,23 +527,25 @@ void wxFrame::SetMenuBar(
         return;
     }
 
-    wxCHECK_RET(!pMenuBar->GetFrame(), wxT("this menubar is already attached"));
+    m_frameMenuBar = NULL;
 
-    if (m_frameMenuBar)
-        delete m_frameMenuBar;
-
-    m_hMenu = pMenuBar->Create();
-    m_ulMenubarId = pMenuBar->GetMenubarId();
-    if (m_ulMenubarId != FID_MENU)
+    // Can set a menubar several times.
+    // TODO: how to prevent a memory leak if you have a currently-unattached
+    // menubar? wxWindows assumes that the frame will delete the menu (otherwise
+    // there are problems for MDI).
+    if (pMenuBar->GetHMenu())
     {
-        ::WinSetWindowUShort( m_hMenu
-                             ,QWS_ID
-                             ,(unsigned short)m_ulMenubarId
-                            );
+        m_hMenu = pMenuBar->GetHMenu();
     }
+    else
+    {
+        pMenuBar->Detach();
 
-    if (!m_hMenu)
-        return;
+        m_hMenu = pMenuBar->Create();
+
+        if (!m_hMenu)
+            return;
+    }
 
     InternalSetMenuBar();
 

diff --git a/src/os2/window.cpp b/src/os2/window.cpp
index 01e0e83c3001574083b07151da96a046c0c7dc0c..c4b8665f2baf0614211a0a586ddf04f1611af2f2 100644 (file)
--- a/src/os2/window.cpp
+++ b/src/os2/window.cpp
@@ -84,6 +84,10 @@
     #define GET_Y_LPARAM(mp) ((unsigned short)(unsigned long)(mp >> 16))
 #endif // GET_X_LPARAM
 
+#ifndef CW_USEDEFAULT
+#  define CW_USEDEFAULT    ((int)0x80000000)
+#endif
+
 // ---------------------------------------------------------------------------
 // global variables
 // ---------------------------------------------------------------------------