Updates for VA 4.0

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

diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp
index e15c049b133c8c8672ff98b81127c2a8ce72f880..3464ed330028b62f23b3698ef1e4545a2dec8bdc 100644 (file)
--- a/src/os2/frame.cpp
+++ b/src/os2/frame.cpp
@@ -685,7 +685,7 @@ bool wxFrame::ProcessCommand(int id)
     if ( !bar )
         return FALSE;
 
     if ( !bar )
         return FALSE;
 

-    wxMenuItem *item = bar->FindItemForId(id);
+    wxMenuItem *item = bar->FindItem(id);

 
     if ( item &&  item->IsCheckable() )
     {
 
     if ( item &&  item->IsCheckable() )
     {

diff --git a/src/os2/gsocket.c b/src/os2/gsocket.c
index 4f53fa5fc06ab39f9c214ca24c0bd6b799bf612e..85ea3a2313d18a6de82f7abb73b19cc1cb51d2f5 100644 (file)
--- a/src/os2/gsocket.c
+++ b/src/os2/gsocket.c
@@ -14,15 +14,15 @@
 #define BSD_SELECT // use Berkley Sockets select
 
 #include <assert.h>
 #define BSD_SELECT // use Berkley Sockets select
 
 #include <assert.h>

-#include <ioctl.h>
+#include <sys\ioctl.h>

 #include <sys\types.h>
 #include <sys\types.h>

-#include <socket.h>
+#include <sys\socket.h>

 #include <utils.h>
 #include <sys\time.h>
 #include <in.h>
 #include <netdb.h>
 #include <nerrno.h>
 #include <utils.h>
 #include <sys\time.h>
 #include <in.h>
 #include <netdb.h>
 #include <nerrno.h>

-#include <select.h>
+#include <sys\select.h>

 
 #include <string.h>
 #include <stdio.h>
 
 #include <string.h>
 #include <stdio.h>

diff --git a/src/os2/makefile.va b/src/os2/makefile.va
index cde236d408f7653596078f99835e57aef0bfdb73..aee9ec83096c40b631eae04cd51a33be3bde1b6b 100644 (file)
--- a/src/os2/makefile.va
+++ b/src/os2/makefile.va
@@ -220,6 +220,7 @@ COMMONOBJS = \
   ..\common\$D\longlong.obj \
   ..\common\$D\matrix.obj \
   ..\common\$D\memory.obj \
   ..\common\$D\longlong.obj \
   ..\common\$D\matrix.obj \
   ..\common\$D\memory.obj \

+  ..\common\$D\menucmn.obj \

   ..\common\$D\mimetype.obj \
   ..\common\$D\module.obj \
   ..\common\$D\mstream.obj \
   ..\common\$D\mimetype.obj \
   ..\common\$D\module.obj \
   ..\common\$D\mstream.obj \


@@ -319,6 +320,7 @@ COMLIBOBJS2 = \
   longlong.obj \
   matrix.obj \
   memory.obj \
   longlong.obj \
   matrix.obj \
   memory.obj \

+  menucmn.obj \

   mimetype.obj \
   module.obj \
   mstream.obj \
   mimetype.obj \
   module.obj \
   mstream.obj \


@@ -352,10 +354,10 @@ COMLIBOBJS2 = \
   url.obj \
   utilscmn.obj \
   valgen.obj \
   url.obj \
   utilscmn.obj \
   valgen.obj \

-  validate.obj \
-  valtext.obj
+  validate.obj

 
 COMLIBOBJS3 = \
 
 COMLIBOBJS3 = \

+  valtext.obj \

   variant.obj \
   wfstream.obj \
   wincmn.obj \
   variant.obj \
   wfstream.obj \
   wincmn.obj \


@@ -622,6 +624,7 @@ $(COMLIBOBJS2):
   copy ..\common\$D\longlong.obj
   copy ..\common\$D\matrix.obj
   copy ..\common\$D\memory.obj
   copy ..\common\$D\longlong.obj
   copy ..\common\$D\matrix.obj
   copy ..\common\$D\memory.obj

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

   copy ..\common\$D\mimetype.obj
   copy ..\common\$D\module.obj
   copy ..\common\$D\mstream.obj
   copy ..\common\$D\mimetype.obj
   copy ..\common\$D\module.obj
   copy ..\common\$D\mstream.obj


@@ -656,9 +659,9 @@ $(COMLIBOBJS2):
   copy ..\common\$D\utilscmn.obj
   copy ..\common\$D\valgen.obj
   copy ..\common\$D\validate.obj
   copy ..\common\$D\utilscmn.obj
   copy ..\common\$D\valgen.obj
   copy ..\common\$D\validate.obj

-  copy ..\common\$D\valtext.obj

 
 $(COMLIBOBJS3):
 
 $(COMLIBOBJS3):

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

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

diff --git a/src/os2/mdi.cpp b/src/os2/mdi.cpp
index b30e8d41d7e49fbb7b2338a109002f271215b5af..33756f07928a7226a154bb9f406b1a2f6307d840 100644 (file)
--- a/src/os2/mdi.cpp
+++ b/src/os2/mdi.cpp
@@ -910,7 +910,7 @@ bool wxMDIChildFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd)
 //            return TRUE;
     }
 
 //            return TRUE;
     }
 

-    if (GetMenuBar() && GetMenuBar()->FindItemForId(id))
+    if (GetMenuBar() && GetMenuBar()->FindItem(id))

     {
         ProcessCommand(id);
         return TRUE;
     {
         ProcessCommand(id);
         return TRUE;

diff --git a/src/os2/utils.cpp b/src/os2/utils.cpp
index 12f65cee2a1a264cdfc7fa4d5c5748a8b3de04a3..abea758038897dad3ab8dd19b37d4ab2d9427c8b 100644 (file)
--- a/src/os2/utils.cpp
+++ b/src/os2/utils.cpp
@@ -40,7 +40,6 @@
 #define INCL_PM
 #define INCL_GPI
 #include <os2.h>
 #define INCL_PM
 #define INCL_GPI
 #include <os2.h>

-#include<netdb.h>

 #define PURE_32
 #include <upm.h>
 #include <netcons.h>
 #define PURE_32
 #include <upm.h>
 #include <netcons.h>