1. new wxList code
2. fixes to allow compilation at -W4 with VisualC++ 6.0 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1035 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -20,6 +20,12 @@
|
||||
#pragma hdrstop
|
||||
#endif
|
||||
|
||||
#if wxUSE_WX_RESOURCES
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning(disable:4706) // assignment within conditional expression
|
||||
#endif // VC++
|
||||
|
||||
#ifndef WX_PRECOMP
|
||||
#include "wx/defs.h"
|
||||
#include "wx/setup.h"
|
||||
@@ -59,8 +65,6 @@
|
||||
|
||||
#include "wx/log.h"
|
||||
|
||||
#if wxUSE_WX_RESOURCES
|
||||
|
||||
#include <ctype.h>
|
||||
#include <math.h>
|
||||
#include <stdlib.h>
|
||||
@@ -2853,4 +2857,8 @@ wxControl *wxWindow::CreateItem(const wxItemResource *resource, const wxItemReso
|
||||
return table->CreateItem((wxWindow *)this, resource, parentResource);
|
||||
}
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning(default:4706) // assignment within conditional expression
|
||||
#endif // VC++
|
||||
|
||||
#endif // wxUSE_WX_RESOURCES
|
||||
|
Reference in New Issue
Block a user