Use __WINDOWS__ for OS checks and __WXMSW__ for GUI checks (round 2).

This is continuation of r70796 and serves the same purpose.

Closes #14065, #14066.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70808 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-03-04 20:31:42 +00:00
parent 3a1ec1d5dc
commit bb5a951418
33 changed files with 69 additions and 63 deletions

View File

@@ -22,8 +22,8 @@
#pragma hdrstop
#endif
#ifndef __WXMSW__
#error "This sample is MSW-only"
#ifndef __WINDOWS__
#error "This sample is Windows-only"
#endif
#include "wx/app.h"

View File

@@ -31,8 +31,8 @@
#include "wx/stattext.h"
#include "wx/button.h"
#ifndef __WXMSW__
#error "This sample is MSW-only"
#ifndef __WINDOWS__
#error "This sample is Windows-only"
#endif
#ifdef WXUSINGDLL

View File

@@ -32,7 +32,7 @@
#include "wx/msw/ole/automtn.h"
#ifndef __WXMSW__
#ifndef __WINDOWS__
#error "Sorry, this sample works under Windows only."
#endif

View File

@@ -31,7 +31,7 @@
#include "wx/imaglist.h"
#include "wx/tokenzr.h"
#if wxUSE_CONFIG_NATIVE && defined( __WXMSW__ )
#if wxUSE_CONFIG_NATIVE && defined( __WINDOWS__ )
# define DO_REGTEST 1
#else
# define DO_REGTEST 0

View File

@@ -37,7 +37,7 @@
// define this to use XPMs everywhere (by default, BMPs are used under Win)
// BMPs use less space, but aren't compiled into the executable on other platforms
#ifdef __WXMSW__
#ifdef __WINDOWS__
#define USE_XPM_BITMAPS 0
#else
#define USE_XPM_BITMAPS 1