Minor corrections to make dist after reports

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

diff --git a/demos/bombs/bombs.cpp b/demos/bombs/bombs.cpp
index 875e9600738bcd9466551c8816c023da6d2930b7..83e4652fca809ec9c379abb97f4b9e0f6ca3a611 100644 (file)
--- a/demos/bombs/bombs.cpp
+++ b/demos/bombs/bombs.cpp
@@ -2,251 +2,326 @@
 // Name:        bombs.cpp
 // Purpose:     Bombs game
 // Author:      P. Foggia 1996
 // Name:        bombs.cpp
 // Purpose:     Bombs game
 // Author:      P. Foggia 1996

-// Modified by:
+// Modified by: Wlodzimierz Skiba (ABX) since 2003

 // Created:     1996
 // RCS-ID:      $Id$
 // Copyright:   (c) 1996 P. Foggia
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Created:     1996
 // RCS-ID:      $Id$
 // Copyright:   (c) 1996 P. Foggia
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

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

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

+#ifdef __BORLANDC__
+#   pragma hdrstop
+#endif
+

 #ifndef  WX_PRECOMP
 #ifndef  WX_PRECOMP

-  #include "wx/wx.h"
+#   include "wx/wx.h"

 #endif //precompiled headers
 
 #endif //precompiled headers
 

+#include "wx/stockitem.h"
+

 #include "bombs.h"
 
 #include "bombs.h"
 

-#include <time.h>

 #include <stdlib.h>
 
 #include <stdlib.h>
 

-#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__)
-#include "bombs.xpm"
+#ifndef __WXWINCE__
+#   include <time.h>
+#endif
+
+#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) \
+    || defined(__WXMAC__) || defined(__WXMGL__)
+#   include "bombs.xpm"

 #endif
 
 #endif
 

-IMPLEMENT_APP(AppClass)
+IMPLEMENT_APP(BombsApp)
+
+#ifdef __WXWINCE__
+    STDAPI_(__int64) CeGetRandomSeed();
+#endif

 
 // Called to initialize the program
 
 // Called to initialize the program

-bool AppClass::OnInit()
+bool BombsApp::OnInit()

 {
 {

-  srand((unsigned)time(NULL));
-
-  // Initialize all the top-level window members to NULL.
-  BombsFrame = NULL;
-  level=IDM_EASY;
+#ifdef __WXWINCE__
+    srand((unsigned) CeGetRandomSeed());
+#else
+    srand((unsigned) time(NULL));
+#endif

 
 

-  BombsFrame = 
-    new BombsFrameClass(NULL, "wxBombs", wxPoint(155, 165), wxSize(300, 300), wxMINIMIZE_BOX | wxSYSTEM_MENU | wxCAPTION);
+    m_frame = new BombsFrame(&m_game);

 
 

-  int xmax=BombsFrame->BombsCanvas->field_width*BombsFrame->BombsCanvas->x_cell*X_UNIT;
-  int ymax=BombsFrame->BombsCanvas->field_height*BombsFrame->BombsCanvas->y_cell*Y_UNIT;
-  BombsFrame->SetClientSize(xmax, ymax);
+    m_frame->NewGame(bombsID_EASY, false);

 
 

-  return TRUE;
+    return true;

 }
 
 }
 

-BEGIN_EVENT_TABLE(BombsFrameClass, wxFrame)
-    EVT_MENU(IDM_EASY, BombsFrameClass::OnEasy)
-    EVT_MENU(IDM_MEDIUM, BombsFrameClass::OnMedium)
-    EVT_MENU(IDM_DIFFICULT, BombsFrameClass::OnDifficult)
-    EVT_MENU(IDM_EXIT, BombsFrameClass::OnExit)
-    EVT_MENU(IDM_ABOUT, BombsFrameClass::OnAbout)
-    EVT_MENU(IDM_RESTART, BombsFrameClass::OnRestart)
-    EVT_CLOSE(BombsFrameClass::OnCloseWindow)
+BEGIN_EVENT_TABLE(BombsFrame, wxFrame)
+    EVT_MENU(wxID_NEW,           BombsFrame::OnNewGame)
+    EVT_MENU(bombsID_EASY,       BombsFrame::OnEasyGame)
+    EVT_MENU(bombsID_MEDIUM,     BombsFrame::OnMediumGame)
+    EVT_MENU(bombsID_HARD,       BombsFrame::OnHardGame)
+    EVT_MENU(bombsID_EASYCORNER, BombsFrame::OnEasyCorner)
+    EVT_MENU(wxID_EXIT,          BombsFrame::OnExit)
+    EVT_MENU(wxID_ABOUT,         BombsFrame::OnAbout)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-BombsFrameClass::BombsFrameClass(wxFrame *parent, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
-  wxFrame(parent, -1, title, pos, size, style)
+BombsFrame::BombsFrame(BombsGame *game)
+    : wxFrame(NULL, wxID_ANY, wxT("wxBombs"), wxDefaultPosition,
+        wxSize(300, 300), wxDEFAULT_DIALOG_STYLE|wxMINIMIZE_BOX)

 {
 {

-  // Initialize child subwindow members.
-  BombsCanvas = NULL;
-
-  SetIcon(wxICON(bombs));
-
-  CreateStatusBar();
-  
-  // Create a menu bar for the frame
-  wxMenuBar *menuBar1 = new wxMenuBar;
-  wxMenu *menu1 = new wxMenu;
-  menu1->Append(IDM_EXIT, "E&xit"); // , "Quit the program");
-  menu1->AppendSeparator();
-  menu1->Append(IDM_ABOUT, "&About..."); // , "Infos on wxBombs");
-  menuBar1->Append(menu1, "&File");
-  wxMenu *menu2 = new wxMenu;
-  menu2->Append(IDM_RESTART, "&Restart"); // , "Clear the play field");
-  menu2->AppendSeparator();
-  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;
-  menuBar->Check(wxGetApp().level, TRUE);
-
-  // Create child subwindows.
-  BombsCanvas = new BombsCanvasClass(this);
-
-  // Ensure the subwindows get resized o.k.
-//  OnSize(width, height);
-
-  // Centre frame on the screen.
-  Centre(wxBOTH);
-
-  // Show the frame.
-  Show(TRUE);
+    m_game = game;
+    m_easyCorner = false;
+    m_lastLevel = bombsID_EASY;
+
+    SetIcon(wxICON(bombs));
+
+#if wxUSE_STATUSBAR
+    CreateStatusBar();
+#endif
+
+    // Create a menu bar for the frame
+    wxMenuBar *menuBar = new wxMenuBar;
+    wxMenu *menuFile = new wxMenu;
+    wxMenu *menuLevel = new wxMenu;
+    menuLevel->AppendRadioItem(bombsID_EASY, wxT("&Easy (10x10)\tCtrl-1"));
+    menuLevel->AppendRadioItem(bombsID_MEDIUM, wxT("&Medium (15x15)\tCtrl-2"));
+    menuLevel->AppendRadioItem(bombsID_HARD, wxT("&Hard (25x20)\tCtrl-3"));
+
+    menuFile->Append(wxID_NEW, wxT("&New game\tCtrl-N"));
+    menuFile->Append(bombsID_LEVEL, wxT("&Level"),menuLevel, wxT("Starts a new game"));
+    menuFile->AppendCheckItem(bombsID_EASYCORNER, wxT("&Easy corner"));
+
+    menuFile->AppendSeparator();
+    menuFile->Append(wxID_EXIT, wxGetStockLabel(wxID_EXIT), wxT("Quits the application"));
+
+    menuBar->Append(menuFile, wxT("&File"));
+
+
+    wxMenu *menuHelp = new wxMenu;
+    menuHelp->Append(wxID_ABOUT, wxT("&About"),
+        wxT("Displays the program information") );
+
+    menuBar->Append(menuHelp, wxT("&Help"));
+
+    SetMenuBar(menuBar);
+
+    // Create child subwindows.
+    m_canvas = new BombsCanvas(this, m_game);
+
+    // Ensure the subwindows get resized o.k.
+    //  OnSize(width, height);
+
+    // Centre frame on the screen.
+    Centre(wxBOTH);
+
+    // Show the frame.
+    Show();

 }
 
 }
 

-BombsFrameClass::~BombsFrameClass(void)
+void BombsFrame::OnExit(wxCommandEvent& WXUNUSED(event))

 {
 {

+    Close();

 }
 
 }
 

-void BombsFrameClass::OnCloseWindow(wxCloseEvent& event)
+void BombsFrame::NewGame(int level, bool query)

 {
 {

-  this->Destroy();
+    if(query)
+    {
+       int ok = wxMessageBox(
+                  wxT("Start new game regardless previous board?"),
+                  wxT("Confirm"),
+                  wxYES_NO | wxICON_QUESTION,
+                  this
+                );
+       if(ok!=wxYES)return;
+    }
+
+    int numHorzCells = 20, numVertCells = 20;
+    m_lastLevel = level;
+
+    switch(level)
+    {
+    case bombsID_EASY:
+        numHorzCells = numVertCells = 10;
+        break;
+
+    case bombsID_MEDIUM:
+        numHorzCells = numVertCells = 15;
+        break;
+
+    case bombsID_HARD:
+        numHorzCells = 25; numVertCells = 20;
+        break;
+
+    default :
+        wxFAIL_MSG(wxT("Invalid level"));
+        break;
+    }
+
+    m_game->Init(numHorzCells, numVertCells, m_easyCorner);
+
+    GetMenuBar()->Check(level, true);
+
+    m_canvas->UpdateGridSize();
+    SetClientSize(m_canvas->GetGridSizeInPixels());

 }
 
 }
 

-void BombsFrameClass::OnExit(wxCommandEvent& event)
+void BombsFrame::OnAbout(wxCommandEvent& WXUNUSED(event))

 {
 {

-    this->Destroy();
+    wxMessageBox(
+        wxT("wxBombs (c) 1996 by P. Foggia\n<foggia@amalfi.dis.unina.it>"),
+        wxT("About wxBombs") );

 }
 
 }
 

-void BombsFrameClass::OnRestart(wxCommandEvent& event)
+void BombsFrame::OnNewGame(wxCommandEvent& WXUNUSED(event))

 {
 {

-    BombsCanvas->UpdateFieldSize();
-    int xmax=BombsCanvas->field_width*BombsCanvas->x_cell*X_UNIT;
-    int ymax=BombsCanvas->field_height*BombsCanvas->y_cell*Y_UNIT;
-    wxGetApp().BombsFrame->SetClientSize(xmax, ymax);
+    NewGame(m_lastLevel, true);

 }
 
 }
 

-void BombsFrameClass::OnAbout(wxCommandEvent& event)
+void BombsFrame::OnEasyGame(wxCommandEvent& WXUNUSED(event))

 {
 {

-    wxMessageBox("wxBombs (c) 1996 by P. Foggia\n<foggia@amalfi.dis.unina.it>", "About wxBombs");
+    NewGame(bombsID_EASY, true);

 }
 
 }
 

-void BombsFrameClass::OnEasy(wxCommandEvent& event)
+void BombsFrame::OnMediumGame(wxCommandEvent& WXUNUSED(event))

 {
 {

-    menuBar->Check(wxGetApp().level, FALSE);
-    wxGetApp().level=IDM_EASY;
-    menuBar->Check(wxGetApp().level, TRUE);
+    NewGame(bombsID_MEDIUM, true);

 }
 
 }
 

-void BombsFrameClass::OnMedium(wxCommandEvent& event)
+void BombsFrame::OnHardGame(wxCommandEvent& WXUNUSED(event))

 {
 {

-    menuBar->Check(wxGetApp().level, FALSE);
-    wxGetApp().level=IDM_MEDIUM;
-    menuBar->Check(wxGetApp().level, TRUE);
+    NewGame(bombsID_HARD, true);

 }
 
 }
 

-void BombsFrameClass::OnDifficult(wxCommandEvent& event)
+void BombsFrame::OnEasyCorner(wxCommandEvent& WXUNUSED(event))

 {
 {

-    menuBar->Check(wxGetApp().level, FALSE);
-    wxGetApp().level=IDM_DIFFICULT;
-    menuBar->Check(wxGetApp().level, TRUE);
+    wxString msg;
+    if(m_easyCorner)
+        msg = wxT("enable");
+    else
+        msg = wxT("disable");
+
+    msg = wxT("Do you really want to ") + msg + wxT(" having\ntop left corner always empty for easier start?");
+
+    int ok = wxMessageBox(
+               msg,
+               wxT("Confirm"),
+               wxYES_NO | wxICON_QUESTION,
+               this
+             );
+
+    if(ok!=wxYES)return;
+
+    m_easyCorner = !m_easyCorner;
+
+    NewGame(m_lastLevel, true);

 }
 
 }
 

-BEGIN_EVENT_TABLE(BombsCanvasClass, wxWindow)
-    EVT_PAINT(BombsCanvasClass::OnPaint)
-    EVT_MOUSE_EVENTS(BombsCanvasClass::OnEvent)
+BEGIN_EVENT_TABLE(BombsCanvas, wxPanel)
+    EVT_PAINT(BombsCanvas::OnPaint)
+    EVT_MOUSE_EVENTS(BombsCanvas::OnMouseEvent)
+    EVT_CHAR(BombsCanvas::OnChar)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-BombsCanvasClass::BombsCanvasClass(wxFrame *parent, const wxPoint& pos, const wxSize& size, long style):
-  wxWindow(parent, -1, pos, size, style)
-{ 
-  int sx, sy;
-  wxClientDC dc(this);
-  wxFont font= BOMBS_FONT;
-  dc.SetFont(font);
+BombsCanvas::BombsCanvas(wxFrame *parent, BombsGame *game)
+    : wxPanel(parent, wxID_ANY)
+{
+    m_game = game;
+    int sx, sy;
+    wxClientDC dc(this);
+    wxFont font= BOMBS_FONT;
+    dc.SetFont(font);

 
 

-  long chw, chh;
-  char buf[]="M";
+    wxCoord chw, chh;
+    wxString buf = wxT("M");

 
 

-  dc.GetTextExtent(buf, &chw, &chh);
-  dc.SetFont(wxNullFont);
+    dc.GetTextExtent(buf, &chw, &chh);
+    dc.SetFont(wxNullFont);

 
 

-  dc.SetMapMode(wxMM_METRIC);
+    dc.SetMapMode(wxMM_METRIC);

 
 

-  int xcm = dc.LogicalToDeviceX(10.0);
-  int ycm = dc.LogicalToDeviceY(10.0);
+    int xcm = dc.LogicalToDeviceX(10);
+    int ycm = dc.LogicalToDeviceY(10);

     // To have a square cell, there must be :
     //    sx*ycm == sy*xcm
     // To have a square cell, there must be :
     //    sx*ycm == sy*xcm

-  if (chw*ycm < chh*xcm)
-    { sy=chh;
-      sx=chh*xcm/ycm;
+    if (chw*ycm < chh*xcm)
+    {
+        sy = chh;
+        sx = chh*xcm/ycm;

     }
     }

-  else
-    { sx=chw;
-      sy=chw*ycm/xcm;
+    else
+    {
+        sx = chw;
+        sy = chw*ycm/xcm;

     }
     }

-  x_cell = (sx+3+X_UNIT)/X_UNIT;
-  y_cell = (sy+3+Y_UNIT)/Y_UNIT;
-  dc.SetMapMode(wxMM_TEXT);
-  bmp=NULL;
-  UpdateFieldSize();
+
+    m_cellWidth = (sx+3+X_UNIT)/X_UNIT;
+    m_cellHeight = (sy+3+Y_UNIT)/Y_UNIT;
+    dc.SetMapMode(wxMM_TEXT);
+    m_bmp = NULL;

 }
 
 }
 

-BombsCanvasClass::~BombsCanvasClass(void)
+BombsCanvas::~BombsCanvas()

 {
 {

-  if (bmp)
-    delete bmp;
+    if (m_bmp)
+    {
+        delete m_bmp;
+        m_bmp = NULL;
+    }

 }
 
 // Called when canvas needs to be repainted.
 }
 
 // Called when canvas needs to be repainted.

-void BombsCanvasClass::OnPaint(wxPaintEvent& event)
+void BombsCanvas::OnPaint(wxPaintEvent& WXUNUSED(event))

 {
 {

-  wxPaintDC dc(this);
-
-  // Insert your drawing code here.
-  if (!bmp)
-    { bmp=new wxBitmap(field_width*x_cell*X_UNIT+1,
-                       field_height*y_cell*Y_UNIT+1);
-      if (bmp)
-        { wxMemoryDC memDC;
-          memDC.SelectObject(* bmp);
-          DrawField(&memDC, 0, 0, field_width-1, field_height-1);
-          memDC.SelectObject(wxNullBitmap);
+    wxPaintDC dc(this);
+
+    const int numHorzCells = m_game->GetWidth();
+    const int numVertCells = m_game->GetHeight();
+    // Insert your drawing code here.
+    if (!m_bmp)
+    {
+        wxSize size = dc.GetSize();
+        m_bmp = new wxBitmap(size.GetWidth(), size.GetHeight());
+        if (m_bmp)
+        {
+            wxMemoryDC memDC;
+            memDC.SelectObject(*m_bmp);
+            DrawField(&memDC, 0, 0, numHorzCells-1, numVertCells-1);
+            memDC.SelectObject(wxNullBitmap);

         }
     }
         }
     }

-  if (bmp)
-    { wxMemoryDC memDC;
-      memDC.SelectObject(* bmp);
-      dc.Blit(0, 0, field_width*x_cell*X_UNIT+1,
-                          field_height*y_cell*Y_UNIT+1,
-                    &memDC, 0, 0, wxCOPY);
+
+    if (m_bmp)
+    {
+        wxMemoryDC memDC;
+        memDC.SelectObject(*m_bmp);
+        wxSize size = dc.GetSize();
+        dc.Blit(0, 0, size.GetWidth(), size.GetHeight(),
+            &memDC, 0, 0, wxCOPY);

       memDC.SelectObject(wxNullBitmap);
     }
       memDC.SelectObject(wxNullBitmap);
     }

-  else
-    DrawField(& dc, 0, 0, field_width-1, field_height-1);
+    else
+    {
+        DrawField(&dc, 0, 0, numHorzCells-1, numVertCells-1);
+    }
+}
+
+void BombsCanvas::UpdateGridSize()
+{
+
+    if (m_bmp)
+    {
+        delete m_bmp;
+        m_bmp = NULL;
+    }
+    SetSize(GetGridSizeInPixels());
+    Refresh();
+}
+
+wxSize BombsCanvas::GetGridSizeInPixels() const
+{
+    return wxSize(m_cellWidth*X_UNIT*m_game->GetWidth(),
+        m_cellHeight*Y_UNIT*m_game->GetHeight());

 }
 
 }
 

-// Updates the field size depending on wxGetApp().level and
-// redraws the canvas
-void BombsCanvasClass::UpdateFieldSize()
-  { field_width=20;
-    field_height=20;
-
-    switch(wxGetApp().level)
-      { case IDM_EASY:
-          field_width=10;
-          field_height=10;
-          break;
-        case IDM_MEDIUM:
-          field_width=15;
-          field_height=15;
-          break;
-        case IDM_DIFFICULT:
-          field_width=25;
-          field_height=20;
-          break;
-      }
-    wxGetApp().Game.Init(field_width, field_height);
-
-    if (bmp)
-      delete bmp;
-    bmp=NULL;
-    
-    wxWindow::Refresh();
-  }