X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8710cf5cabdb94c688f2d8d01ee83ac9b715125d..cbd4be25b2189b674491c0d296c9efacec1a5778:/samples/bombs/bombs.cpp

diff --git a/samples/bombs/bombs.cpp b/samples/bombs/bombs.cpp
index 0494fc7f8d..cdf7b8570d 100644
--- a/samples/bombs/bombs.cpp
+++ b/samples/bombs/bombs.cpp
@@ -79,9 +79,9 @@ BombsFrameClass::BombsFrameClass(wxFrame *parent, const wxString& title, const w
   wxMenu *menu2 = new wxMenu;
   menu2->Append(IDM_RESTART, "&Restart"); // , "Clear the play field");
   menu2->AppendSeparator();
-  menu2->Append(IDM_EASY, "&Easy", (char*)NULL, TRUE); // "10x10 play field", TRUE);
-  menu2->Append(IDM_MEDIUM, "&Medium", (char*)NULL, TRUE); // "15x15 play field", TRUE);
-  menu2->Append(IDM_DIFFICULT, "&Difficult", (char*)NULL, TRUE); // "25x20 play field", TRUE);
+  menu2->Append(IDM_EASY, "&Easy", wxEmptyString, TRUE); // "10x10 play field", TRUE);
+  menu2->Append(IDM_MEDIUM, "&Medium", wxEmptyString, TRUE); // "15x15 play field", TRUE);
+  menu2->Append(IDM_DIFFICULT, "&Difficult", wxEmptyString, TRUE); // "25x20 play field", TRUE);
   menuBar1->Append(menu2, "&Game");
   SetMenuBar(menuBar1);
   menuBar=menuBar1;
@@ -167,7 +167,7 @@ BombsCanvasClass::BombsCanvasClass(wxFrame *parent, const wxPoint& pos, const wx
   dc.GetTextExtent(buf, &chw, &chh);
   dc.SetFont(wxNullFont);
 
-  dc.SetMapMode(MM_METRIC);
+  dc.SetMapMode(wxMM_METRIC);
 
   int xcm = dc.LogicalToDeviceX(10.0);
   int ycm = dc.LogicalToDeviceY(10.0);
@@ -183,7 +183,7 @@ BombsCanvasClass::BombsCanvasClass(wxFrame *parent, const wxPoint& pos, const wx
     }
   x_cell = (sx+3+X_UNIT)/X_UNIT;
   y_cell = (sy+3+Y_UNIT)/Y_UNIT;
-  dc.SetMapMode(MM_TEXT);
+  dc.SetMapMode(wxMM_TEXT);
   bmp=NULL;
   UpdateFieldSize();
 }