Make it possible to use svn-find-native-eols script without svn checkout.

[wxWidgets.git] / demos / bombs / bombs.cpp

diff --git a/demos/bombs/bombs.cpp b/demos/bombs/bombs.cpp
index 1f4ef00c3f7f544728b90863aad85fd40d62b4e0..2c756fcff3fb8847a1e4eaf66ada5350bab634d8 100644 (file)
--- a/demos/bombs/bombs.cpp
+++ b/demos/bombs/bombs.cpp
@@ -29,8 +29,7 @@
 #   include <time.h>
 #endif
 
-#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) \
-    || defined(__WXMAC__) || defined(__WXMGL__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
 #   include "bombs.xpm"
 #endif
 
@@ -233,7 +232,7 @@ BombsCanvas::BombsCanvas(wxFrame *parent, BombsGame *game)
     wxFont font= BOMBS_FONT;
     dc.SetFont(font);
 
-    long chw, chh;
+    wxCoord chw, chh;
     wxString buf = wxT("M");
 
     dc.GetTextExtent(buf, &chw, &chh);