Merge pull request #478 from stahta01/staging

Fix wxGTK/Win32 build with "--disable-wxdib".
2017-05-22 00:25:03 +02:00
parent 84e58117f8 2d0ac3d027
commit d2c2274baa
2 changed files with 5 additions and 5 deletions
--- a/samples/toolbar/toolbar.cpp
+++ b/samples/toolbar/toolbar.cpp
@@ -36,7 +36,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 __WINDOWS__
+#if defined(__WINDOWS__) && wxUSE_WXDIB
    #define USE_XPM_BITMAPS 0
 #else
    #define USE_XPM_BITMAPS 1