Updates for VA 4.0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4323 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -685,7 +685,7 @@ bool wxFrame::ProcessCommand(int id)
|
|||||||
if ( !bar )
|
if ( !bar )
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
wxMenuItem *item = bar->FindItemForId(id);
|
wxMenuItem *item = bar->FindItem(id);
|
||||||
|
|
||||||
if ( item && item->IsCheckable() )
|
if ( item && item->IsCheckable() )
|
||||||
{
|
{
|
||||||
|
@@ -14,15 +14,15 @@
|
|||||||
#define BSD_SELECT // use Berkley Sockets select
|
#define BSD_SELECT // use Berkley Sockets select
|
||||||
|
|
||||||
#include <assert.h>
|
#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 <utils.h>
|
||||||
#include <sys\time.h>
|
#include <sys\time.h>
|
||||||
#include <in.h>
|
#include <in.h>
|
||||||
#include <netdb.h>
|
#include <netdb.h>
|
||||||
#include <nerrno.h>
|
#include <nerrno.h>
|
||||||
#include <select.h>
|
#include <sys\select.h>
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
@@ -220,6 +220,7 @@ COMMONOBJS = \
|
|||||||
..\common\$D\longlong.obj \
|
..\common\$D\longlong.obj \
|
||||||
..\common\$D\matrix.obj \
|
..\common\$D\matrix.obj \
|
||||||
..\common\$D\memory.obj \
|
..\common\$D\memory.obj \
|
||||||
|
..\common\$D\menucmn.obj \
|
||||||
..\common\$D\mimetype.obj \
|
..\common\$D\mimetype.obj \
|
||||||
..\common\$D\module.obj \
|
..\common\$D\module.obj \
|
||||||
..\common\$D\mstream.obj \
|
..\common\$D\mstream.obj \
|
||||||
@@ -319,6 +320,7 @@ COMLIBOBJS2 = \
|
|||||||
longlong.obj \
|
longlong.obj \
|
||||||
matrix.obj \
|
matrix.obj \
|
||||||
memory.obj \
|
memory.obj \
|
||||||
|
menucmn.obj \
|
||||||
mimetype.obj \
|
mimetype.obj \
|
||||||
module.obj \
|
module.obj \
|
||||||
mstream.obj \
|
mstream.obj \
|
||||||
@@ -352,10 +354,10 @@ COMLIBOBJS2 = \
|
|||||||
url.obj \
|
url.obj \
|
||||||
utilscmn.obj \
|
utilscmn.obj \
|
||||||
valgen.obj \
|
valgen.obj \
|
||||||
validate.obj \
|
validate.obj
|
||||||
valtext.obj
|
|
||||||
|
|
||||||
COMLIBOBJS3 = \
|
COMLIBOBJS3 = \
|
||||||
|
valtext.obj \
|
||||||
variant.obj \
|
variant.obj \
|
||||||
wfstream.obj \
|
wfstream.obj \
|
||||||
wincmn.obj \
|
wincmn.obj \
|
||||||
@@ -622,6 +624,7 @@ $(COMLIBOBJS2):
|
|||||||
copy ..\common\$D\longlong.obj
|
copy ..\common\$D\longlong.obj
|
||||||
copy ..\common\$D\matrix.obj
|
copy ..\common\$D\matrix.obj
|
||||||
copy ..\common\$D\memory.obj
|
copy ..\common\$D\memory.obj
|
||||||
|
copy ..\common\$D\menucmn.obj
|
||||||
copy ..\common\$D\mimetype.obj
|
copy ..\common\$D\mimetype.obj
|
||||||
copy ..\common\$D\module.obj
|
copy ..\common\$D\module.obj
|
||||||
copy ..\common\$D\mstream.obj
|
copy ..\common\$D\mstream.obj
|
||||||
@@ -656,9 +659,9 @@ $(COMLIBOBJS2):
|
|||||||
copy ..\common\$D\utilscmn.obj
|
copy ..\common\$D\utilscmn.obj
|
||||||
copy ..\common\$D\valgen.obj
|
copy ..\common\$D\valgen.obj
|
||||||
copy ..\common\$D\validate.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\variant.obj
|
||||||
copy ..\common\$D\wfstream.obj
|
copy ..\common\$D\wfstream.obj
|
||||||
copy ..\common\$D\wincmn.obj
|
copy ..\common\$D\wincmn.obj
|
||||||
|
@@ -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);
|
ProcessCommand(id);
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
@@ -40,7 +40,6 @@
|
|||||||
#define INCL_PM
|
#define INCL_PM
|
||||||
#define INCL_GPI
|
#define INCL_GPI
|
||||||
#include <os2.h>
|
#include <os2.h>
|
||||||
#include<netdb.h>
|
|
||||||
#define PURE_32
|
#define PURE_32
|
||||||
#include <upm.h>
|
#include <upm.h>
|
||||||
#include <netcons.h>
|
#include <netcons.h>
|
||||||
|
Reference in New Issue
Block a user