correcting text alignment flag

[wxWidgets.git] / samples / toolbar / toolbar.cpp

diff --git a/samples/toolbar/toolbar.cpp b/samples/toolbar/toolbar.cpp
index 734a3d39dff2053d74fa00b81914bb9cd85f34db..8f8da745bc73870a8019f2c9a0374bb3223d7cf9 100644 (file)
--- a/samples/toolbar/toolbar.cpp
+++ b/samples/toolbar/toolbar.cpp
@@ -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
 
 // 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
     #define USE_XPM_BITMAPS 0
 #else
     #define USE_XPM_BITMAPS 1


@@ -60,7 +60,7 @@
 // resources
 // ----------------------------------------------------------------------------
 
 // resources
 // ----------------------------------------------------------------------------
 

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif