X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/709d0081619993d7162cf07128338c0a45582f46..8d9eee83203dfc7177cd8639c14a5c809085698d:/demos/bombs/bombs1.cpp?ds=sidebyside diff --git a/demos/bombs/bombs1.cpp b/demos/bombs/bombs1.cpp index a2d874e20d..fcb4bf4201 100644 --- a/demos/bombs/bombs1.cpp +++ b/demos/bombs/bombs1.cpp @@ -14,10 +14,6 @@ * class BombsCanvas */ -#ifdef __GNUG__ -# pragma implementation -#endif - #include "wx/wxprec.h" #ifdef __BORLANDC__ @@ -36,7 +32,7 @@ void BombsCanvas::DrawField(wxDC *dc, int xc1, int yc1, int xc2, int yc2) { wxString buf; - long chw, chh; + wxCoord chw, chh; wxColour wxYellow = wxTheColourDatabase->Find(wxT("YELLOW")); wxColour wxFocused = wxTheColourDatabase->Find(wxT("GREY")); @@ -135,7 +131,7 @@ void BombsCanvas::DrawField(wxDC *dc, int xc1, int yc1, int xc2, int yc2) dc->SetBrush(*focusedBrush); else if (m_game->IsSelected(x,y)) dc->SetBrush(*wxWHITE_BRUSH); - else + else dc->SetBrush(*yellowBrush); dc->DrawRectangle( x*m_cellWidth*X_UNIT, y*m_cellHeight*Y_UNIT, m_cellWidth*X_UNIT+1, m_cellHeight*Y_UNIT+1); @@ -167,7 +163,7 @@ void BombsCanvas::DrawField(wxDC *dc, int xc1, int yc1, int xc2, int yc2) wxString msg; msg.Printf(wxT("%d bombs, %u marked, %d remaining cells"), - m_game->GetNumBombs(), m_game->GetNumMarkedCells(), + m_game->GetNumBombs(), m_game->GetNumMarkedCells(), m_game->GetNumRemainingCells() ); #if wxUSE_LOG && wxUSE_STATUSBAR