X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c80599533f36a899a74ae02a4166a85a64bf7934..337bbb7a06504cf5f55b77ce0a17956b76a5f186:/demos/bombs/bombs.cpp diff --git a/demos/bombs/bombs.cpp b/demos/bombs/bombs.cpp index 4501d80832..2c756fcff3 100644 --- a/demos/bombs/bombs.cpp +++ b/demos/bombs/bombs.cpp @@ -9,10 +9,6 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -# pragma implementation -#endif - #include "wx/wxprec.h" #ifdef __BORLANDC__ @@ -33,8 +29,7 @@ # include #endif -#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) \ - || defined(__WXMAC__) || defined(__WXMGL__) +#ifndef wxHAS_IMAGES_IN_RESOURCES # include "bombs.xpm" #endif @@ -237,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);