Support using GetTextExtent() with empty string to get descent in wxOSX.

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

diff --git a/demos/bombs/bombs.cpp b/demos/bombs/bombs.cpp
index 4501d80832630f1c03f6c1328350531c9f13f74b..2c756fcff3fb8847a1e4eaf66ada5350bab634d8 100644 (file)
--- a/demos/bombs/bombs.cpp
+++ b/demos/bombs/bombs.cpp
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#   pragma implementation
-#endif
-

 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__


@@ -33,8 +29,7 @@
 #   include <time.h>
 #endif
 
 #   include <time.h>
 #endif
 

-#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) \
-    || defined(__WXMAC__) || defined(__WXMGL__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES

 #   include "bombs.xpm"
 #endif
 
 #   include "bombs.xpm"
 #endif
 


@@ -237,7 +232,7 @@ BombsCanvas::BombsCanvas(wxFrame *parent, BombsGame *game)
     wxFont font= BOMBS_FONT;
     dc.SetFont(font);
 
     wxFont font= BOMBS_FONT;
     dc.SetFont(font);
 

-    long chw, chh;
+    wxCoord chw, chh;

     wxString buf = wxT("M");
 
     dc.GetTextExtent(buf, &chw, &chh);
     wxString buf = wxT("M");
 
     dc.GetTextExtent(buf, &chw, &chh);