Loads of framework and dll fixes

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

diff --git a/src/os2/app.cpp b/src/os2/app.cpp
index 2f333e5b1babb8fadcd93d12b290e30af021322b..ff0d9b43ed45c393f2174551fc44c547f6093347 100644 (file)
--- a/src/os2/app.cpp
+++ b/src/os2/app.cpp
@@ -321,13 +321,19 @@ void wxApp::CleanUp()
     wxLog::DontCreateOnDemand();
 
     // this will flush the old messages if any
     wxLog::DontCreateOnDemand();
 
     // this will flush the old messages if any

+#if (!(defined(__VISAGECPP__) && __IBMCPP__ < 400))
+    // another VA 3.0 memory problem here

     delete wxLog::SetActiveTarget(new wxLogStderr);
     delete wxLog::SetActiveTarget(new wxLogStderr);

+#endif

 #endif // wxUSE_LOG
 
     // One last chance for pending objects to be cleaned up
     wxTheApp->DeletePendingObjects();
 
 #endif // wxUSE_LOG
 
     // One last chance for pending objects to be cleaned up
     wxTheApp->DeletePendingObjects();
 

+#if (!(defined(__VISAGECPP__) && __IBMCPP__ < 400))
+    // another VA 3.0 memory problem here

     wxModule::CleanUpModules();
     wxModule::CleanUpModules();

+#endif

 
 #if wxUSE_WX_RESOURCES
     wxCleanUpResourceSystem();
 
 #if wxUSE_WX_RESOURCES
     wxCleanUpResourceSystem();


@@ -339,7 +345,10 @@ void wxApp::CleanUp()
     // by deleting the bitmap list before g_globalCursor goes out of scope
     // (double deletion of the cursor).
     wxSetCursor(wxNullCursor);
     // by deleting the bitmap list before g_globalCursor goes out of scope
     // (double deletion of the cursor).
     wxSetCursor(wxNullCursor);

+#if (!(defined(__VISAGECPP__) && __IBMCPP__ < 400))
+    // another VA 3.0 memory problem here

     delete g_globalCursor;
     delete g_globalCursor;

+#endif

     g_globalCursor = NULL;
 
     wxDeleteStockObjects();
     g_globalCursor = NULL;
 
     wxDeleteStockObjects();


@@ -430,17 +439,14 @@ int wxEntry(
     //
     if (!wxTheApp)
     {
     //
     if (!wxTheApp)
     {

-        wxCHECK_MSG( wxApp::GetInitializerFunction()
-                    ,-1
-                    ,wxT("wxWindows error: No initializer - use IMPLEMENT_APP macro.\n")
-                   );
-
-        wxAppInitializerFunction    fnAppIni = wxApp::GetInitializerFunction();
-        wxObject*                   pTest_app = fnAppIni();
-
-        wxTheApp = (wxApp*)pTest_app;
+        // The app may have declared a global application object, but we recommend
+        // the IMPLEMENT_APP macro is used instead, which sets an initializer
+        // function for delayed, dynamic app object construction.
+        wxCHECK_MSG( wxApp::GetInitializerFunction(), 0,
+                     wxT("No initializer - use IMPLEMENT_APP macro.") );
+        wxTheApp = (*wxApp::GetInitializerFunction()) ();

     }
     }

-    wxCHECK_MSG( wxTheApp, -1, wxT("wxWindows error: no application object") );
+    wxCHECK_MSG( wxTheApp, 0, wxT("You have to define an instance of wxApp!") );

     wxTheApp->argc = argc;
 
 #if wxUSE_UNICODE
     wxTheApp->argc = argc;
 
 #if wxUSE_UNICODE

diff --git a/src/os2/dummydll.cpp b/src/os2/dummydll.cpp
index 30a90204dfe199c6711a9b6fd6be47d85c3dcd87..a06e37c90bebbcbb4d16a29066405c72b8123c26 100644 (file)
--- a/src/os2/dummydll.cpp
+++ b/src/os2/dummydll.cpp
@@ -17,6 +17,9 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

+#define INCL_OS2
+#include <os2.h>
+

 #if defined(__VISAGECPP__)
     char wxDummyChar=0;
 #endif
 #if defined(__VISAGECPP__)
     char wxDummyChar=0;
 #endif

diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp
index 0adff13a4b31c3183e648f5ba0ee6f13eb187328..23a77f120e944dc8e67f3aed144ed3992ab100ee 100644 (file)
--- a/src/os2/frame.cpp
+++ b/src/os2/frame.cpp
@@ -339,30 +339,37 @@ void wxFrame::DoGetPosition(
 // ----------------------------------------------------------------------------
 
 void wxFrame::DoShowWindow(
 // ----------------------------------------------------------------------------
 
 void wxFrame::DoShowWindow(

-  int                               nShowCmd
+  int                               bShowCmd

 )
 {
 )
 {

-    ::WinShowWindow(GetHwnd(), nShowCmd);
-    m_bIconized = nShowCmd == SWP_MINIMIZE;
+    HWND                            hClient;
+
+    hClient = ::WinWindowFromID(GetHwnd(), FID_CLIENT);
+    ::WinShowWindow(GetHwnd(), (BOOL)bShowCmd);
+    ::WinShowWindow(hClient, (BOOL)bShowCmd);

 } // end of wxFrame::DoShowWindow
 
 bool wxFrame::Show(
   bool                              bShow
 )
 {
 } // end of wxFrame::DoShowWindow
 
 bool wxFrame::Show(
   bool                              bShow
 )
 {

-    DoShowWindow(bShow ? SWP_SHOW : SWP_HIDE);
+    SWP                             vSwp;
+
+    DoShowWindow((int)bShow);

 
     if (bShow)
     {
         wxActivateEvent             vEvent(wxEVT_ACTIVATE, TRUE, m_windowId);
 
 
     if (bShow)
     {
         wxActivateEvent             vEvent(wxEVT_ACTIVATE, TRUE, m_windowId);
 

+        ::WinQueryWindowPos(GetHwnd(), &vSwp);
+        m_bIconized = vSwp & SWP_MINIMIZE;

         ::WinSetWindowPos( (HWND) GetHWND()
                           ,HWND_TOP
         ::WinSetWindowPos( (HWND) GetHWND()
                           ,HWND_TOP

-                          ,0
-                          ,0
-                          ,0
-                          ,0
-                          ,SWP_ZORDER
+                          ,vSwp.x
+                          ,vSwp.y
+                          ,vSwp.cx
+                          ,vSwp.cy
+                          ,SWP_ZORDER | SWP_ACTIVATE | SWP_SHOW | SWP_MOVE

                          );
         vEvent.SetEventObject(this);
         GetEventHandler()->ProcessEvent(vEvent);
                          );
         vEvent.SetEventObject(this);
         GetEventHandler()->ProcessEvent(vEvent);


@@ -376,14 +383,16 @@ bool wxFrame::Show(
         {
             HWND                    hWndParent = GetHwndOf(GetParent());
 
         {
             HWND                    hWndParent = GetHwndOf(GetParent());
 

+            ::WinQueryWindowPos(hWndParent, &vSwp);
+            m_bIconized = vSwp & SWP_MINIMIZE;

             if (hWndParent)
                 ::WinSetWindowPos( hWndParent
                                   ,HWND_TOP
             if (hWndParent)
                 ::WinSetWindowPos( hWndParent
                                   ,HWND_TOP

-                                  ,0
-                                  ,0
-                                  ,0
-                                  ,0
-                                  ,SWP_ZORDER
+                                  ,vSwp.x
+                                  ,vSwp.y
+                                  ,vSwp.cx
+                                  ,vSwp.cy
+                                  ,SWP_ZORDER | SWP_ACTIVATE | SWP_SHOW | SWP_MOVE

                                  );
         }
     }
                                  );
         }
     }


@@ -438,11 +447,11 @@ void wxFrame::SetIcon(
 {
     wxFrameBase::SetIcon(rIcon);
 
 {
     wxFrameBase::SetIcon(rIcon);
 

-    if (m_icon.Ok())
+    if ((m_icon.GetHICON()) != NULLHANDLE)

     {
         ::WinSendMsg( GetHwnd()
                      ,WM_SETICON
     {
         ::WinSendMsg( GetHwnd()
                      ,WM_SETICON

-                     ,(MPARAM)((HICON)m_icon.GetHICON())
+                     ,(MPARAM)((HPOINTER)m_icon.GetHICON())

                      ,NULL
                     );
         ::WinSendMsg( GetHwnd()
                      ,NULL
                     );
         ::WinSendMsg( GetHwnd()

diff --git a/src/os2/gsocket.c b/src/os2/gsocket.c
index db5644dad7430d73b6dc1518138ae125e6d6f23f..339142966014bc47df0aa39a6f2275423144d110 100644 (file)
--- a/src/os2/gsocket.c
+++ b/src/os2/gsocket.c
@@ -118,9 +118,6 @@ GSocket *GSocket_new()
                                 /* 10 minutes * 60 sec * 1000 millisec */
   socket->m_establishing        = FALSE;
 
                                 /* 10 minutes * 60 sec * 1000 millisec */
   socket->m_establishing        = FALSE;
 

-  /* We initialize the GUI specific entries here */
-  _GSocket_GUI_Init(socket);
-

   return socket;
 }
 
   return socket;
 }
 


@@ -132,9 +129,6 @@ void GSocket_destroy(GSocket *socket)
   if (socket->m_fd != -1)
     GSocket_Shutdown(socket);
 
   if (socket->m_fd != -1)
     GSocket_Shutdown(socket);
 

-  /* We destroy GUI specific variables */
-  _GSocket_GUI_Destroy(socket);
-

   /* We destroy private addresses */
   if (socket->m_local)
     GAddress_destroy(socket->m_local);
   /* We destroy private addresses */
   if (socket->m_local)
     GAddress_destroy(socket->m_local);


@@ -165,7 +159,7 @@ void GSocket_Shutdown(GSocket *socket)
     socket->m_cbacks[evt] = NULL;
 
   socket->m_detected = 0;
     socket->m_cbacks[evt] = NULL;
 
   socket->m_detected = 0;

-  _GSocket_Disable_Events(socket);
+  (socket);

 }
 
 /* Address handling */
 }
 
 /* Address handling */


@@ -296,7 +290,6 @@ GSocketError GSocket_SetServer(GSocket *sck)
   }
 
   ioctl(sck->m_fd, FIONBIO, (char*)&arg, sizeof(int));
   }
 
   ioctl(sck->m_fd, FIONBIO, (char*)&arg, sizeof(int));

-  _GSocket_Enable_Events(sck);

 
   /* Bind the socket to the LOCAL address */
   if (bind(sck->m_fd, sck->m_local->m_addr, sck->m_local->m_len) < 0) {
 
   /* Bind the socket to the LOCAL address */
   if (bind(sck->m_fd, sck->m_local->m_addr, sck->m_local->m_len) < 0) {


@@ -372,8 +365,6 @@ GSocket *GSocket_WaitConnection(GSocket *socket)
   connection->m_oriented = TRUE;
 
   ioctl(connection->m_fd, FIONBIO, (char*)&arg, sizeof(int));
   connection->m_oriented = TRUE;
 
   ioctl(connection->m_fd, FIONBIO, (char*)&arg, sizeof(int));

-  _GSocket_Enable_Events(connection);
-

   return connection;
 }
 
   return connection;
 }
 


@@ -408,7 +399,6 @@ GSocketError GSocket_SetNonOriented(GSocket *sck)
   }
 
   ioctl(sck->m_fd, FIONBIO, (char*)&arg, sizeof(int));
   }
 
   ioctl(sck->m_fd, FIONBIO, (char*)&arg, sizeof(int));

-  _GSocket_Enable_Events(sck);

 
   /* Bind it to the LOCAL address */
   if (bind(sck->m_fd, sck->m_local->m_addr, sck->m_local->m_len) < 0) {
 
   /* Bind it to the LOCAL address */
   if (bind(sck->m_fd, sck->m_local->m_addr, sck->m_local->m_len) < 0) {


@@ -474,7 +464,6 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
   }
 
   ioctl(sck->m_fd, FIONBIO, (char*)&arg, sizeof(int));
   }
 
   ioctl(sck->m_fd, FIONBIO, (char*)&arg, sizeof(int));

-  _GSocket_Enable_Events(sck);

 
   /* Connect it to the PEER address */
   ret = connect(sck->m_fd, sck->m_peer->m_addr, sck->m_peer->m_len);
 
   /* Connect it to the PEER address */
   ret = connect(sck->m_fd, sck->m_peer->m_addr, sck->m_peer->m_len);


@@ -732,13 +721,12 @@ void GSocket_UnsetCallback(GSocket *socket, GSocketEventFlags flags)
 void _GSocket_Enable(GSocket *socket, GSocketEvent event)
 {
   socket->m_detected &= ~(1 << event);
 void _GSocket_Enable(GSocket *socket, GSocketEvent event)
 {
   socket->m_detected &= ~(1 << event);

-  _GSocket_Install_Callback(socket, event);
+  (socket, event);

 }
 
 void _GSocket_Disable(GSocket *socket, GSocketEvent event)
 {
   socket->m_detected |= (1 << event);
 }
 
 void _GSocket_Disable(GSocket *socket, GSocketEvent event)
 {
   socket->m_detected |= (1 << event);

-  _GSocket_Uninstall_Callback(socket, event);

 }
 
 /* _GSocket_Input_Timeout:
 }
 
 /* _GSocket_Input_Timeout:

diff --git a/src/os2/makefile.va b/src/os2/makefile.va
index ce471c95f4f00adf08c4bda4cfff0b45a8bddbb4..190951eaeda74d3ff6fde533aa8f1d7b3edf1a5c 100644 (file)
--- a/src/os2/makefile.va
+++ b/src/os2/makefile.va
@@ -101,7 +101,10 @@ GENERICOBJS= \
   ..\generic\$D\choicdgg.obj \
   ..\generic\$D\colrdlgg.obj \
   ..\generic\$D\dcpsg.obj \
   ..\generic\$D\choicdgg.obj \
   ..\generic\$D\colrdlgg.obj \
   ..\generic\$D\dcpsg.obj \

+  ..\generic\$D\dragimgg.obj \
+  ..\generic\$D\fontdlgg.obj \

   ..\generic\$D\grid.obj \
   ..\generic\$D\grid.obj \

+  ..\generic\$D\gridsel.obj \

   ..\generic\$D\helpext.obj \
   ..\generic\$D\helphtml.obj \
   ..\generic\$D\helpwxht.obj \
   ..\generic\$D\helpext.obj \
   ..\generic\$D\helphtml.obj \
   ..\generic\$D\helpwxht.obj \


@@ -124,9 +127,12 @@ GENERICOBJS= \
   ..\generic\$D\splitter.obj \
   ..\generic\$D\statusbr.obj \
   ..\generic\$D\tabg.obj \
   ..\generic\$D\splitter.obj \
   ..\generic\$D\statusbr.obj \
   ..\generic\$D\tabg.obj \

+  ..\generic\$D\tbarsmpl.obj \

   ..\generic\$D\textdlgg.obj \
   ..\generic\$D\tipdlg.obj \
   ..\generic\$D\textdlgg.obj \
   ..\generic\$D\tipdlg.obj \

-  ..\generic\$D\treectrl.obj
+  ..\generic\$D\treectrl.obj \
+  ..\generic\$D\treelay.obj \
+  ..\generic\$D\wizard.obj

 
 #  ..\generic\$D\gridg.obj \
 #  ..\generic\$D\notebook.obj \
 
 #  ..\generic\$D\gridg.obj \
 #  ..\generic\$D\notebook.obj \


@@ -138,7 +144,10 @@ GENLIBOBJS= \
   choicdgg.obj \
   colrdlgg.obj \
   dcpsg.obj \
   choicdgg.obj \
   colrdlgg.obj \
   dcpsg.obj \

+  dragimgg.obj \
+  fontdlgg.obj \

   grid.obj \
   grid.obj \

+  gridsel.obj \

   helpext.obj \
   helphtml.obj \
   helpwxht.obj \
   helpext.obj \
   helphtml.obj \
   helpwxht.obj \


@@ -161,30 +170,37 @@ GENLIBOBJS= \
   splitter.obj \
   statusbr.obj \
   tabg.obj \
   splitter.obj \
   statusbr.obj \
   tabg.obj \

+  tbarsmpl.obj \

   textdlgg.obj \
   tipdlg.obj \
   textdlgg.obj \
   tipdlg.obj \

-  treectrl.obj
+  treectrl.obj \
+  treelay.obj \
+  wizard.obj

 
 # These are generic things that don't need to be compiled on PM,
 # but sometimes it's useful to do so for testing purposes.
 NONESSENTIALOBJS= \
 
 # These are generic things that don't need to be compiled on PM,
 # but sometimes it's useful to do so for testing purposes.
 NONESSENTIALOBJS= \

-  ..\generic\$D\msgdlgg.obj \
-  ..\generic\$D\fontdlgg.obj
+  ..\generic\$D\msgdlgg.obj

 
 COMMONOBJS = \
   ..\common\$D\appcmn.obj \
   ..\common\$D\choiccmn.obj \
   ..\common\$D\clipcmn.obj \
 
 COMMONOBJS = \
   ..\common\$D\appcmn.obj \
   ..\common\$D\choiccmn.obj \
   ..\common\$D\clipcmn.obj \

+  ..\common\$D\cmdline.obj \

   ..\common\$D\cmndata.obj \
   ..\common\$D\config.obj \
   ..\common\$D\ctrlcmn.obj \
   ..\common\$D\ctrlsub.obj \
   ..\common\$D\datetime.obj \
   ..\common\$D\datstrm.obj \
   ..\common\$D\cmndata.obj \
   ..\common\$D\config.obj \
   ..\common\$D\ctrlcmn.obj \
   ..\common\$D\ctrlsub.obj \
   ..\common\$D\datetime.obj \
   ..\common\$D\datstrm.obj \

+!if "$(WXMAKINGDLL)" != "1"
+# don't have an ODBC database

   ..\common\$D\db.obj \
   ..\common\$D\dbtable.obj \
   ..\common\$D\db.obj \
   ..\common\$D\dbtable.obj \

+!endif

   ..\common\$D\dcbase.obj \
   ..\common\$D\dlgcmn.obj \
   ..\common\$D\dcbase.obj \
   ..\common\$D\dlgcmn.obj \

+  ..\common\$D\dndcmn.obj \

   ..\common\$D\dobjcmn.obj \
   ..\common\$D\docmdi.obj \
   ..\common\$D\docview.obj \
   ..\common\$D\dobjcmn.obj \
   ..\common\$D\docmdi.obj \
   ..\common\$D\docview.obj \


@@ -202,9 +218,11 @@ COMMONOBJS = \
   ..\common\$D\fontmap.obj \
   ..\common\$D\framecmn.obj \
   ..\common\$D\fs_inet.obj \
   ..\common\$D\fontmap.obj \
   ..\common\$D\framecmn.obj \
   ..\common\$D\fs_inet.obj \

+  ..\common\$D\fs_mem.obj \

   ..\common\$D\fs_zip.obj \
   ..\common\$D\ftp.obj \
   ..\common\$D\gdicmn.obj \
   ..\common\$D\fs_zip.obj \
   ..\common\$D\ftp.obj \
   ..\common\$D\gdicmn.obj \

+  ..\common\$D\geometry.obj \

   ..\common\$D\gifdecod.obj \
   ..\common\$D\hash.obj \
   ..\common\$D\helpbase.obj \
   ..\common\$D\gifdecod.obj \
   ..\common\$D\hash.obj \
   ..\common\$D\helpbase.obj \


@@ -217,6 +235,7 @@ COMMONOBJS = \
   ..\common\$D\imagpcx.obj \
   ..\common\$D\imagpng.obj \
   ..\common\$D\imagpnm.obj \
   ..\common\$D\imagpcx.obj \
   ..\common\$D\imagpng.obj \
   ..\common\$D\imagpnm.obj \

+  ..\common\$D\imagtiff.obj \

   ..\common\$D\intl.obj \
   ..\common\$D\ipcbase.obj \
   ..\common\$D\layout.obj \
   ..\common\$D\intl.obj \
   ..\common\$D\ipcbase.obj \
   ..\common\$D\layout.obj \


@@ -232,6 +251,10 @@ COMMONOBJS = \
   ..\common\$D\mstream.obj \
   ..\common\$D\object.obj \
   ..\common\$D\objstrm.obj \
   ..\common\$D\mstream.obj \
   ..\common\$D\object.obj \
   ..\common\$D\objstrm.obj \

+!if "$(WXMAKINGDLL)" != "1"
+# don't have an ODBC database
+  ..\common\$D\odbc.obj \
+!endif

   ..\common\$D\paper.obj \
   ..\common\$D\prntbase.obj \
   ..\common\$D\process.obj \
   ..\common\$D\paper.obj \
   ..\common\$D\prntbase.obj \
   ..\common\$D\process.obj \


@@ -272,6 +295,7 @@ COMLIBOBJS1 = \
   appcmn.obj \
   choiccmn.obj \
   clipcmn.obj \
   appcmn.obj \
   choiccmn.obj \
   clipcmn.obj \

+  cmdline.obj \

   cmndata.obj \
   config.obj \
   ctrlcmn.obj \
   cmndata.obj \
   config.obj \
   ctrlcmn.obj \


@@ -281,6 +305,7 @@ COMLIBOBJS1 = \
   db.obj \
   dbtable.obj \
   dcbase.obj \
   db.obj \
   dbtable.obj \
   dcbase.obj \

+  dndcmn.obj \

   dlgcmn.obj \
   dobjcmn.obj \
   docmdi.obj \
   dlgcmn.obj \
   dobjcmn.obj \
   docmdi.obj \


@@ -299,23 +324,26 @@ COMLIBOBJS1 = \
   fontmap.obj \
   framecmn.obj \
   fs_inet.obj \
   fontmap.obj \
   framecmn.obj \
   fs_inet.obj \

+  fs_mem.obj \

   fs_zip.obj \
   ftp.obj \
   gdicmn.obj \
   fs_zip.obj \
   ftp.obj \
   gdicmn.obj \

+  geometry.obj \

   gifdecod.obj \
   hash.obj \
   helpbase.obj \
   http.obj \
   imagall.obj \
   imagbmp.obj \
   gifdecod.obj \
   hash.obj \
   helpbase.obj \
   http.obj \
   imagall.obj \
   imagbmp.obj \

-  image.obj \
+  image.obj
+
+COMLIBOBJS2 = \

   imaggif.obj \
   imagjpeg.obj \
   imagpcx.obj \
   imaggif.obj \
   imagjpeg.obj \
   imagpcx.obj \

-  imagpng.obj
-
-COMLIBOBJS2 = \
+  imagpng.obj \

   imagpnm.obj \
   imagpnm.obj \

+  imagtiff.obj \

   intl.obj \
   ipcbase.obj \
   layout.obj \
   intl.obj \
   ipcbase.obj \
   layout.obj \


@@ -331,6 +359,7 @@ COMLIBOBJS2 = \
   mstream.obj \
   object.obj \
   objstrm.obj \
   mstream.obj \
   object.obj \
   objstrm.obj \

+  odbc.obj \

   paper.obj \
   prntbase.obj \
   process.obj \
   paper.obj \
   prntbase.obj \
   process.obj \


@@ -350,15 +379,15 @@ COMLIBOBJS2 = \
   textcmn.obj \
   textfile.obj \
   timercmn.obj \
   textcmn.obj \
   textfile.obj \
   timercmn.obj \

-  tokenzr.obj \
+  tokenzr.obj
+
+COMLIBOBJS3 = \

   txtstrm.obj \
   unzip.obj \
   url.obj \
   utilscmn.obj \
   valgen.obj \
   txtstrm.obj \
   unzip.obj \
   url.obj \
   utilscmn.obj \
   valgen.obj \

-  validate.obj
-
-COMLIBOBJS3 = \
+  validate.obj \

   valtext.obj \
   variant.obj \
   wfstream.obj \
   valtext.obj \
   variant.obj \
   wfstream.obj \


@@ -539,12 +568,14 @@ HTMLOBJS = \
   ..\html\$D\htmltag.obj \
   ..\html\$D\htmlwin.obj \
   ..\html\$D\htmprint.obj \
   ..\html\$D\htmltag.obj \
   ..\html\$D\htmlwin.obj \
   ..\html\$D\htmprint.obj \

+  ..\html\$D\m_dflist.obj \

   ..\html\$D\m_fonts.obj \
   ..\html\$D\m_hline.obj \
   ..\html\$D\m_image.obj \
   ..\html\$D\m_layout.obj \
   ..\html\$D\m_links.obj \
   ..\html\$D\m_list.obj \
   ..\html\$D\m_fonts.obj \
   ..\html\$D\m_hline.obj \
   ..\html\$D\m_image.obj \
   ..\html\$D\m_layout.obj \
   ..\html\$D\m_links.obj \
   ..\html\$D\m_list.obj \

+  ..\html\$D\m_meta.obj \

   ..\html\$D\m_pre.obj \
   ..\html\$D\m_tables.obj \
   ..\html\$D\winpars.obj
   ..\html\$D\m_pre.obj \
   ..\html\$D\m_tables.obj \
   ..\html\$D\winpars.obj


@@ -559,12 +590,14 @@ HTMLLIBOBJS = \
   htmltag.obj \
   htmlwin.obj \
   htmprint.obj \
   htmltag.obj \
   htmlwin.obj \
   htmprint.obj \

+  m_dflist.obj \

   m_fonts.obj \
   m_hline.obj \
   m_image.obj \
   m_layout.obj \
   m_links.obj \
   m_list.obj \
   m_fonts.obj \
   m_hline.obj \
   m_image.obj \
   m_layout.obj \
   m_links.obj \
   m_list.obj \

+  m_meta.obj \

   m_pre.obj \
   m_tables.obj \
   winpars.obj
   m_pre.obj \
   m_tables.obj \
   winpars.obj


@@ -585,14 +618,13 @@ $D\dummy.obj: dummy.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(WXDIR)\include\wx\os2\
         icc $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummy.obj /Tp dummy.cpp
 
 $D\dummydll.obj: dummydll.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(WXDIR)\include\wx\os2\setup.h
         icc $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummy.obj /Tp dummy.cpp
 
 $D\dummydll.obj: dummydll.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(WXDIR)\include\wx\os2\setup.h

-        icc @<<
-$(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummydll.obj /c /Tp dummydll.cpp
-<<
+        icc $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummydll.obj /Tp dummydll.cpp

 
 $(COMLIBOBJS1):
   copy ..\common\$D\appcmn.obj
   copy ..\common\$D\choiccmn.obj
   copy ..\common\$D\clipcmn.obj
 
 $(COMLIBOBJS1):
   copy ..\common\$D\appcmn.obj
   copy ..\common\$D\choiccmn.obj
   copy ..\common\$D\clipcmn.obj

+  copy ..\common\$D\cmdline.obj

   copy ..\common\$D\cmndata.obj
   copy ..\common\$D\config.obj
   copy ..\common\$D\ctrlcmn.obj
   copy ..\common\$D\cmndata.obj
   copy ..\common\$D\config.obj
   copy ..\common\$D\ctrlcmn.obj


@@ -603,6 +635,7 @@ $(COMLIBOBJS1):
   copy ..\common\$D\dbtable.obj
   copy ..\common\$D\dcbase.obj
   copy ..\common\$D\dlgcmn.obj
   copy ..\common\$D\dbtable.obj
   copy ..\common\$D\dcbase.obj
   copy ..\common\$D\dlgcmn.obj

+  copy ..\common\$D\dndcmn.obj

   copy ..\common\$D\dobjcmn.obj
   copy ..\common\$D\docmdi.obj
   copy ..\common\$D\docview.obj
   copy ..\common\$D\dobjcmn.obj
   copy ..\common\$D\docmdi.obj
   copy ..\common\$D\docview.obj


@@ -620,9 +653,11 @@ $(COMLIBOBJS1):
   copy ..\common\$D\fontmap.obj
   copy ..\common\$D\framecmn.obj
   copy ..\common\$D\fs_inet.obj
   copy ..\common\$D\fontmap.obj
   copy ..\common\$D\framecmn.obj
   copy ..\common\$D\fs_inet.obj

+  copy ..\common\$D\fs_mem.obj

   copy ..\common\$D\fs_zip.obj
   copy ..\common\$D\ftp.obj
   copy ..\common\$D\gdicmn.obj
   copy ..\common\$D\fs_zip.obj
   copy ..\common\$D\ftp.obj
   copy ..\common\$D\gdicmn.obj

+  copy ..\common\$D\geometry.obj

   copy ..\common\$D\gifdecod.obj
   copy ..\common\$D\hash.obj
   copy ..\common\$D\helpbase.obj
   copy ..\common\$D\gifdecod.obj
   copy ..\common\$D\hash.obj
   copy ..\common\$D\helpbase.obj


@@ -630,13 +665,14 @@ $(COMLIBOBJS1):
   copy ..\common\$D\imagall.obj
   copy ..\common\$D\imagbmp.obj
   copy ..\common\$D\image.obj
   copy ..\common\$D\imagall.obj
   copy ..\common\$D\imagbmp.obj
   copy ..\common\$D\image.obj

+
+$(COMLIBOBJS2):

   copy ..\common\$D\imaggif.obj
   copy ..\common\$D\imagjpeg.obj
   copy ..\common\$D\imagpcx.obj
   copy ..\common\$D\imagpng.obj
   copy ..\common\$D\imaggif.obj
   copy ..\common\$D\imagjpeg.obj
   copy ..\common\$D\imagpcx.obj
   copy ..\common\$D\imagpng.obj

-
-$(COMLIBOBJS2):

   copy ..\common\$D\imagpnm.obj
   copy ..\common\$D\imagpnm.obj

+  copy ..\common\$D\imagtiff.obj

   copy ..\common\$D\intl.obj
   copy ..\common\$D\ipcbase.obj
   copy ..\common\$D\layout.obj
   copy ..\common\$D\intl.obj
   copy ..\common\$D\ipcbase.obj
   copy ..\common\$D\layout.obj


@@ -652,6 +688,7 @@ $(COMLIBOBJS2):
   copy ..\common\$D\mstream.obj
   copy ..\common\$D\object.obj
   copy ..\common\$D\objstrm.obj
   copy ..\common\$D\mstream.obj
   copy ..\common\$D\object.obj
   copy ..\common\$D\objstrm.obj

+  copy ..\common\$D\odbc.obj

   copy ..\common\$D\paper.obj
   copy ..\common\$D\prntbase.obj
   copy ..\common\$D\process.obj
   copy ..\common\$D\paper.obj
   copy ..\common\$D\prntbase.obj
   copy ..\common\$D\process.obj


@@ -672,14 +709,14 @@ $(COMLIBOBJS2):
   copy ..\common\$D\textfile.obj
   copy ..\common\$D\timercmn.obj
   copy ..\common\$D\tokenzr.obj
   copy ..\common\$D\textfile.obj
   copy ..\common\$D\timercmn.obj
   copy ..\common\$D\tokenzr.obj

+
+$(COMLIBOBJS3):

   copy ..\common\$D\txtstrm.obj
   copy ..\common\$D\unzip.obj
   copy ..\common\$D\url.obj
   copy ..\common\$D\utilscmn.obj
   copy ..\common\$D\valgen.obj
   copy ..\common\$D\validate.obj
   copy ..\common\$D\txtstrm.obj
   copy ..\common\$D\unzip.obj
   copy ..\common\$D\url.obj
   copy ..\common\$D\utilscmn.obj
   copy ..\common\$D\valgen.obj
   copy ..\common\$D\validate.obj

-
-$(COMLIBOBJS3):

   copy ..\common\$D\valtext.obj
   copy ..\common\$D\variant.obj
   copy ..\common\$D\wfstream.obj
   copy ..\common\$D\valtext.obj
   copy ..\common\$D\variant.obj
   copy ..\common\$D\wfstream.obj


@@ -696,8 +733,11 @@ $(GENLIBOBJS):
   copy ..\generic\$D\caret.obj
   copy ..\generic\$D\choicdgg.obj
   copy ..\generic\$D\colrdlgg.obj
   copy ..\generic\$D\caret.obj
   copy ..\generic\$D\choicdgg.obj
   copy ..\generic\$D\colrdlgg.obj

+  copy ..\generic\$D\dragimgg.obj

   copy ..\generic\$D\dcpsg.obj
   copy ..\generic\$D\dcpsg.obj

+  copy ..\generic\$D\fontdlgg.obj

   copy ..\generic\$D\grid.obj
   copy ..\generic\$D\grid.obj

+  copy ..\generic\$D\gridsel.obj

   copy ..\generic\$D\helpext.obj
   copy ..\generic\$D\helphtml.obj
   copy ..\generic\$D\helpwxht.obj
   copy ..\generic\$D\helpext.obj
   copy ..\generic\$D\helphtml.obj
   copy ..\generic\$D\helpwxht.obj


@@ -720,9 +760,12 @@ $(GENLIBOBJS):
   copy ..\generic\$D\splitter.obj
   copy ..\generic\$D\statusbr.obj
   copy ..\generic\$D\tabg.obj
   copy ..\generic\$D\splitter.obj
   copy ..\generic\$D\statusbr.obj
   copy ..\generic\$D\tabg.obj

+  copy ..\generic\$D\tbarsmpl.obj

   copy ..\generic\$D\textdlgg.obj
   copy ..\generic\$D\tipdlg.obj
   copy ..\generic\$D\treectrl.obj
   copy ..\generic\$D\textdlgg.obj
   copy ..\generic\$D\tipdlg.obj
   copy ..\generic\$D\treectrl.obj

+  copy ..\generic\$D\treelay.obj
+  copy ..\generic\$D\wizard.obj

 
 $(HTMLLIBOBJS):
   copy ..\html\$D\helpctrl.obj
 
 $(HTMLLIBOBJS):
   copy ..\html\$D\helpctrl.obj


@@ -734,12 +777,14 @@ $(HTMLLIBOBJS):
   copy ..\html\$D\htmltag.obj
   copy ..\html\$D\htmlwin.obj
   copy ..\html\$D\htmprint.obj
   copy ..\html\$D\htmltag.obj
   copy ..\html\$D\htmlwin.obj
   copy ..\html\$D\htmprint.obj

+  copy ..\html\$D\m_dflist.obj

   copy ..\html\$D\m_fonts.obj
   copy ..\html\$D\m_hline.obj
   copy ..\html\$D\m_image.obj
   copy ..\html\$D\m_layout.obj
   copy ..\html\$D\m_links.obj
   copy ..\html\$D\m_list.obj
   copy ..\html\$D\m_fonts.obj
   copy ..\html\$D\m_hline.obj
   copy ..\html\$D\m_image.obj
   copy ..\html\$D\m_layout.obj
   copy ..\html\$D\m_links.obj
   copy ..\html\$D\m_list.obj

+  copy ..\html\$D\m_meta.obj

   copy ..\html\$D\m_pre.obj
   copy ..\html\$D\m_tables.obj
   copy ..\html\$D\winpars.obj
   copy ..\html\$D\m_pre.obj
   copy ..\html\$D\m_tables.obj
   copy ..\html\$D\winpars.obj


@@ -949,13 +994,15 @@ $(WXDIR)\lib\wx214.lib: $(OBJECTS)
     implib $(WXDIR)\lib\wx214.lib $(WXDIR)\lib\wx214.def
 
 # Update the dynamic link library
     implib $(WXDIR)\lib\wx214.lib $(WXDIR)\lib\wx214.def
 
 # Update the dynamic link library

-$(WXDIR)\lib\wx214.dll: $(OBJECTS) $(WXDIR)\lib\wx214.lib
+$(WXDIR)\lib\wx214.dll: $(OBJECTS)

     icc @<<
     /B" $(LINKFLAGS)" /Fe$@
     $(LIBS)
     icc @<<
     /B" $(LINKFLAGS)" /Fe$@
     $(LIBS)

+    $(DUMMYOBJ)

     $(OBJECTS)
     $(WXDIR)\lib\wx214.def
 <<
     $(OBJECTS)
     $(WXDIR)\lib\wx214.def
 <<

+    implib $(WXDIR)\lib\wx214.lib $(WXDIR)\lib\wx214.def

 
 !endif
 
 
 !endif
 


@@ -1037,11 +1084,7 @@ clean_tiff:
     nmake -f makefile.va clean
     cd $(WXDIR)\src\os2
 
     nmake -f makefile.va clean
     cd $(WXDIR)\src\os2
 

-clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_xpm clean_tiff
-        del      $(LIBTARGET)
-!if "$(WXMAKINGDLL)" == "1"
-        erase /N ..\..\lib\wx214.lib
-!endif
+clean:  $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_xpm clean_tiff

         erase /N $(GENDIR)\$D\*.obj
         erase /N $(COMMDIR)\$D\*.obj
         erase /N $(HTMLDIR)\$D\*.obj
         erase /N $(GENDIR)\$D\*.obj
         erase /N $(COMMDIR)\$D\*.obj
         erase /N $(HTMLDIR)\$D\*.obj


@@ -1053,6 +1096,10 @@ clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_xpm clean_ti
         rd      ..\common\$D
         rd      ..\html\$D
         rd      ..\os2\$D
         rd      ..\common\$D
         rd      ..\html\$D
         rd      ..\os2\$D

+        del      $(LIBTARGET)
+!if "$(WXMAKINGDLL)" == "1"
+        erase /N ..\..\lib\wx214.lib
+!endif

 
 cleanall: clean
 
 
 cleanall: clean
 

diff --git a/src/os2/menu.cpp b/src/os2/menu.cpp
index 8ff449298fbe16a47a29ad05915dcbe3eac60995..c90a5ebbdfead3b1b641b2d0fa050e0f6d54eade 100644 (file)
--- a/src/os2/menu.cpp
+++ b/src/os2/menu.cpp
@@ -278,12 +278,17 @@ bool wxMenu::DoInsertOrAppend(
     //
     if (nPos == (size_t)-1)
     {
     //
     if (nPos == (size_t)-1)
     {

-        HWND                        hSubMenu = ::WinCreateWindow( GetWinHwnd(m_menuBar) // parent
+        HWND                        hMenuBar;
+        if (m_menuBar)
+            hMenuBar = GetWinHwnd(m_menuBar);
+        else
+            hMenuBar = HWND_DESKTOP;
+        HWND                        hSubMenu = ::WinCreateWindow( hMenuBar              // parent

                                                                  ,WC_MENU               // type
                                                                  ,"Menu"                // a generic name
                                                                  ,0L                    // no style flag
                                                                  ,0L,0L,0L,0L           // no position
                                                                  ,WC_MENU               // type
                                                                  ,"Menu"                // a generic name
                                                                  ,0L                    // no style flag
                                                                  ,0L,0L,0L,0L           // no position

-                                                                 ,GetWinHwnd(m_menuBar) // no owner
+                                                                 ,hMenuBar              // no owner

                                                                  ,HWND_TOP              // always on top
                                                                  ,0L                    // no ID needed for dynamic creation
                                                                  ,NULL                  // no control data
                                                                  ,HWND_TOP              // always on top
                                                                  ,0L                    // no ID needed for dynamic creation
                                                                  ,NULL                  // no control data