Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Applied patch #825402 ("Fix for Unicode Open Watcom build of life demo"); Code cleanup.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Dimitri Schoolwerth
2003-11-14 17:19:44 +00:00
parent 9f55ceabf4
commit 22c1c01b13
1 changed files with 84 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

128
demos/life/life.cpp
View File

@@ -66,18 +66,15 @@
// constants // constants
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
// IDs for the controls and the menu commands // IDs for the controls and the menu commands. Exluding those already defined
// by wxWindows, such as wxID_NEW.
enum enum
{ {
// timer // timer
ID_TIMER = 1001, ID_TIMER = wxID_HIGHEST,
// file menu // file menu
ID_NEW,
ID_OPEN,
ID_SAMPLES, ID_SAMPLES,
ID_ABOUT,
ID_EXIT,
// view menu // view menu
ID_SHOWNAV, ID_SHOWNAV,
@@ -98,7 +95,7 @@ enum
ID_TOPSPEED, ID_TOPSPEED,
// speed selection slider // speed selection slider
ID_SLIDER, ID_SLIDER
}; };
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
@@ -107,11 +104,11 @@ enum
// Event tables // Event tables
BEGIN_EVENT_TABLE(LifeFrame, wxFrame) BEGIN_EVENT_TABLE(LifeFrame, wxFrame)
EVT_MENU (ID_NEW, LifeFrame::OnMenu) EVT_MENU (wxID_NEW, LifeFrame::OnMenu)
EVT_MENU (ID_OPEN, LifeFrame::OnOpen) EVT_MENU (wxID_OPEN, LifeFrame::OnOpen)
EVT_MENU (ID_SAMPLES, LifeFrame::OnSamples) EVT_MENU (ID_SAMPLES, LifeFrame::OnSamples)
EVT_MENU (ID_ABOUT, LifeFrame::OnMenu) EVT_MENU (wxID_ABOUT, LifeFrame::OnMenu)
EVT_MENU (ID_EXIT, LifeFrame::OnMenu) EVT_MENU (wxID_EXIT, LifeFrame::OnMenu)
EVT_MENU (ID_SHOWNAV, LifeFrame::OnMenu) EVT_MENU (ID_SHOWNAV, LifeFrame::OnMenu)
EVT_MENU (ID_ORIGIN, LifeFrame::OnNavigate) EVT_MENU (ID_ORIGIN, LifeFrame::OnNavigate)
EVT_BUTTON (ID_CENTER, LifeFrame::OnNavigate) EVT_BUTTON (ID_CENTER, LifeFrame::OnNavigate)
@@ -157,7 +154,7 @@ IMPLEMENT_APP(LifeApp)
// some shortcuts // some shortcuts
#define ADD_TOOL(id, bmp, tooltip, help) \ #define ADD_TOOL(id, bmp, tooltip, help) \
toolBar->AddTool(id, bmp, wxNullBitmap, FALSE, -1, -1, (wxObject *)0, tooltip, help) toolBar->AddTool(id, bmp, wxNullBitmap, false, -1, -1, (wxObject *)0, tooltip, help)
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
@@ -171,7 +168,7 @@ bool LifeApp::OnInit()
LifeFrame *frame = new LifeFrame(); LifeFrame *frame = new LifeFrame();
// show it and tell the application that it's our main window // show it and tell the application that it's our main window
frame->Show(TRUE); frame->Show(true);
SetTopWindow(frame); SetTopWindow(frame);
// just for Motif // just for Motif
@@ -180,7 +177,7 @@ bool LifeApp::OnInit()
#endif #endif
// enter the main message loop and run the app // enter the main message loop and run the app
return TRUE; return true;
} }
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
@@ -188,26 +185,26 @@ bool LifeApp::OnInit()
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
// frame constructor // frame constructor
LifeFrame::LifeFrame() : wxFrame((wxFrame *)0, -1, _("Life!"), wxPoint(200, 200)) LifeFrame::LifeFrame() : wxFrame( (wxFrame *) NULL, wxID_ANY,
_("Life!"), wxPoint(200, 200) )
{ {
// frame icon // frame icon
SetIcon(wxICON(mondrian)); SetIcon(wxICON(mondrian));
// menu bar // menu bar
wxMenu *menuFile = new wxMenu(_T(""), wxMENU_TEAROFF); wxMenu *menuFile = new wxMenu(wxMENU_TEAROFF);
wxMenu *menuView = new wxMenu(_T(""), wxMENU_TEAROFF); wxMenu *menuView = new wxMenu(wxMENU_TEAROFF);
wxMenu *menuGame = new wxMenu(_T(""), wxMENU_TEAROFF); wxMenu *menuGame = new wxMenu(wxMENU_TEAROFF);
wxMenu *menuHelp = new wxMenu(wxMENU_TEAROFF);
menuFile->Append(ID_NEW, _("&New"), _("Start a new game")); menuFile->Append(wxID_NEW, _("&New"), _("Start a new game"));
menuFile->Append(ID_OPEN, _("&Open..."), _("Open an existing Life pattern")); menuFile->Append(wxID_OPEN, _("&Open..."), _("Open an existing Life pattern"));
menuFile->Append(ID_SAMPLES, _("&Sample game..."), _("Select a sample configuration")); menuFile->Append(ID_SAMPLES, _("&Sample game..."), _("Select a sample configuration"));
menuFile->AppendSeparator(); menuFile->AppendSeparator();
menuFile->Append(ID_ABOUT, _("&About...\tCtrl-A"), _("Show about dialog")); menuFile->Append(wxID_EXIT, _("E&xit\tAlt-X"), _("Quit this program"));
menuFile->AppendSeparator();
menuFile->Append(ID_EXIT, _("E&xit\tAlt-X"), _("Quit this program"));
menuView->Append(ID_SHOWNAV, _("Navigation &toolbox"), _("Show or hide toolbox"), TRUE); menuView->Append(ID_SHOWNAV, _("Navigation &toolbox"), _("Show or hide toolbox"), wxITEM_CHECK);
menuView->Check (ID_SHOWNAV, TRUE); menuView->Check(ID_SHOWNAV, true);
menuView->AppendSeparator(); menuView->AppendSeparator();
menuView->Append(ID_ORIGIN, _("&Absolute origin"), _("Go to (0, 0)")); menuView->Append(ID_ORIGIN, _("&Absolute origin"), _("Go to (0, 0)"));
menuView->Append(ID_CENTER, _("&Center of mass"), _("Find center of mass")); menuView->Append(ID_CENTER, _("&Center of mass"), _("Find center of mass"));
@@ -218,19 +215,22 @@ LifeFrame::LifeFrame() : wxFrame((wxFrame *)0, -1, _("Life!"), wxPoint(200, 200)
menuView->AppendSeparator(); menuView->AppendSeparator();
menuView->Append(ID_ZOOMIN, _("Zoom &in\tCtrl-I"), _("Zoom in")); menuView->Append(ID_ZOOMIN, _("Zoom &in\tCtrl-I"), _("Zoom in"));
menuView->Append(ID_ZOOMOUT, _("Zoom &out\tCtrl-O"), _("Zoom out")); menuView->Append(ID_ZOOMOUT, _("Zoom &out\tCtrl-O"), _("Zoom out"));
menuView->Append(ID_INFO, _("&Description...\tCtrl-D"), _("View pattern description")); menuView->Append(ID_INFO, _("&Description\tCtrl-D"), _("View pattern description"));
menuGame->Append(ID_START, _("&Start\tCtrl-S"), _("Start")); menuGame->Append(ID_START, _("&Start\tCtrl-S"), _("Start"));
menuGame->Append(ID_STEP, _("&Next\tCtrl-N"), _("Single step")); menuGame->Append(ID_STEP, _("&Next\tCtrl-N"), _("Single step"));
menuGame->Append(ID_STOP, _("S&top\tCtrl-T"), _("Stop")); menuGame->Append(ID_STOP, _("S&top\tCtrl-T"), _("Stop"));
menuGame->Enable(ID_STOP, FALSE); menuGame->Enable(ID_STOP, false);
menuGame->AppendSeparator(); menuGame->AppendSeparator();
menuGame->Append(ID_TOPSPEED, _("T&op speed!"), _("Go as fast as possible")); menuGame->Append(ID_TOPSPEED, _("T&op speed!"), _("Go as fast as possible"));
menuHelp->Append(wxID_ABOUT, _("&About\tCtrl-A"), _("Show about dialog"));
wxMenuBar *menuBar = new wxMenuBar(); wxMenuBar *menuBar = new wxMenuBar();
menuBar->Append(menuFile, _("&File")); menuBar->Append(menuFile, _("&File"));
menuBar->Append(menuView, _("&View")); menuBar->Append(menuView, _("&View"));
menuBar->Append(menuGame, _("&Game")); menuBar->Append(menuGame, _("&Game"));
menuBar->Append(menuHelp, _("&Help"));
SetMenuBar(menuBar); SetMenuBar(menuBar);
// tool bar // tool bar
@@ -248,8 +248,8 @@ LifeFrame::LifeFrame() : wxFrame((wxFrame *)0, -1, _("Life!"), wxPoint(200, 200)
toolBar->SetMargins(5, 5); toolBar->SetMargins(5, 5);
toolBar->SetToolBitmapSize(wxSize(16, 16)); toolBar->SetToolBitmapSize(wxSize(16, 16));
ADD_TOOL(ID_NEW, tbBitmaps[0], _("New"), _("Start a new game")); ADD_TOOL(wxID_NEW, tbBitmaps[0], _("New"), _("Start a new game"));
ADD_TOOL(ID_OPEN, tbBitmaps[1], _("Open"), _("Open an existing Life pattern")); ADD_TOOL(wxID_OPEN, tbBitmaps[1], _("Open"), _("Open an existing Life pattern"));
toolBar->AddSeparator(); toolBar->AddSeparator();
ADD_TOOL(ID_ZOOMIN, tbBitmaps[2], _("Zoom in"), _("Zoom in")); ADD_TOOL(ID_ZOOMIN, tbBitmaps[2], _("Zoom in"), _("Zoom in"));
ADD_TOOL(ID_ZOOMOUT, tbBitmaps[3], _("Zoom out"), _("Zoom out")); ADD_TOOL(ID_ZOOMOUT, tbBitmaps[3], _("Zoom out"), _("Zoom out"));
@@ -259,7 +259,7 @@ LifeFrame::LifeFrame() : wxFrame((wxFrame *)0, -1, _("Life!"), wxPoint(200, 200)
ADD_TOOL(ID_STOP, tbBitmaps[6], _("Stop"), _("Stop")); ADD_TOOL(ID_STOP, tbBitmaps[6], _("Stop"), _("Stop"));
toolBar->Realize(); toolBar->Realize();
toolBar->EnableTool(ID_STOP, FALSE); // must be after Realize() ! toolBar->EnableTool(ID_STOP, false); // must be after Realize() !
// status bar // status bar
CreateStatusBar(2); CreateStatusBar(2);
@@ -268,8 +268,8 @@ LifeFrame::LifeFrame() : wxFrame((wxFrame *)0, -1, _("Life!"), wxPoint(200, 200)
// game and timer // game and timer
m_life = new Life(); m_life = new Life();
m_timer = new wxTimer(this, ID_TIMER); m_timer = new wxTimer(this, ID_TIMER);
m_running = FALSE; m_running = false;
m_topspeed = FALSE; m_topspeed = false;
m_interval = 500; m_interval = 500;
m_tics = 0; m_tics = 0;
@@ -278,14 +278,14 @@ LifeFrame::LifeFrame() : wxFrame((wxFrame *)0, -1, _("Life!"), wxPoint(200, 200)
// and thus updating the text would result in a refresh of the canvas // and thus updating the text would result in a refresh of the canvas
// if they belong to the same parent. // if they belong to the same parent.
wxPanel *panel1 = new wxPanel(this, -1); wxPanel *panel1 = new wxPanel(this, wxID_ANY);
wxPanel *panel2 = new wxPanel(this, -1); wxPanel *panel2 = new wxPanel(this, wxID_ANY);
// canvas // canvas
m_canvas = new LifeCanvas(panel1, m_life); m_canvas = new LifeCanvas(panel1, m_life);
// info panel // info panel
m_text = new wxStaticText(panel2, -1, m_text = new wxStaticText(panel2, wxID_ANY,
wxEmptyString, wxEmptyString,
wxDefaultPosition, wxDefaultPosition,
wxDefaultSize, wxDefaultSize,
@@ -304,24 +304,21 @@ LifeFrame::LifeFrame() : wxFrame((wxFrame *)0, -1, _("Life!"), wxPoint(200, 200)
wxBoxSizer *sizer2 = new wxBoxSizer(wxVERTICAL); wxBoxSizer *sizer2 = new wxBoxSizer(wxVERTICAL);
wxBoxSizer *sizer3 = new wxBoxSizer(wxVERTICAL); wxBoxSizer *sizer3 = new wxBoxSizer(wxVERTICAL);
sizer1->Add( new wxStaticLine(panel1, -1), 0, wxGROW ); sizer1->Add( new wxStaticLine(panel1, wxID_ANY), 0, wxGROW );
sizer1->Add( m_canvas, 1, wxGROW | wxALL, 2 ); sizer1->Add( m_canvas, 1, wxGROW | wxALL, 2 );
sizer1->Add( new wxStaticLine(panel1, -1), 0, wxGROW ); sizer1->Add( new wxStaticLine(panel1, wxID_ANY), 0, wxGROW );
panel1->SetSizer( sizer1 ); panel1->SetSizer( sizer1 );
panel1->SetAutoLayout( TRUE );
sizer1->Fit( panel1 ); sizer1->Fit( panel1 );
sizer2->Add( m_text, 0, wxGROW | wxTOP, 4 ); sizer2->Add( m_text, 0, wxGROW | wxTOP, 4 );
sizer2->Add( slider, 0, wxCENTRE | wxALL, 4 ); sizer2->Add( slider, 0, wxCENTRE | wxALL, 4 );
panel2->SetSizer( sizer2 ); panel2->SetSizer( sizer2 );
panel2->SetAutoLayout( TRUE );
sizer2->Fit( panel2 ); sizer2->Fit( panel2 );
sizer3->Add( panel1, 1, wxGROW ); sizer3->Add( panel1, 1, wxGROW );
sizer3->Add( panel2, 0, wxGROW ); sizer3->Add( panel2, 0, wxGROW );
SetSizer( sizer3 ); SetSizer( sizer3 );
SetAutoLayout( TRUE );
sizer3->Fit( this ); sizer3->Fit( this );
// set minimum frame size // set minimum frame size
@@ -375,7 +372,7 @@ void LifeFrame::OnMenu(wxCommandEvent& event)
{ {
switch (event.GetId()) switch (event.GetId())
{ {
case ID_NEW: case wxID_NEW:
{ {
// stop if it was running // stop if it was running
OnStop(); OnStop();
@@ -385,19 +382,19 @@ void LifeFrame::OnMenu(wxCommandEvent& event)
UpdateInfoText(); UpdateInfoText();
break; break;
} }
case ID_ABOUT: case wxID_ABOUT:
{ {
LifeAboutDialog dialog(this); LifeAboutDialog dialog(this);
dialog.ShowModal(); dialog.ShowModal();
break; break;
} }
case ID_EXIT: case wxID_EXIT:
{ {
// TRUE is to force the frame to close // true is to force the frame to close
Close(TRUE); Close(true);
break; break;
} }
case ID_SHOWNAV : case ID_SHOWNAV:
{ {
bool checked = GetMenuBar()->GetMenu(1)->IsChecked(ID_SHOWNAV); bool checked = GetMenuBar()->GetMenu(1)->IsChecked(ID_SHOWNAV);
m_navigator->Show(checked); m_navigator->Show(checked);
@@ -420,8 +417,8 @@ void LifeFrame::OnMenu(wxCommandEvent& event)
case ID_STOP : OnStop(); break; case ID_STOP : OnStop(); break;
case ID_TOPSPEED: case ID_TOPSPEED:
{ {
m_running = TRUE; m_running = true;
m_topspeed = TRUE; m_topspeed = true;
UpdateUI(); UpdateUI();
while (m_running && m_topspeed) while (m_running && m_topspeed)
{ {
@@ -437,8 +434,8 @@ void LifeFrame::OnOpen(wxCommandEvent& WXUNUSED(event))
{ {
wxFileDialog filedlg(this, wxFileDialog filedlg(this,
_("Choose a file to open"), _("Choose a file to open"),
_(""), wxEmptyString,
_(""), wxEmptyString,
_("Life patterns (*.lif)|*.lif|All files (*.*)|*.*"), _("Life patterns (*.lif)|*.lif|All files (*.*)|*.*"),
wxOPEN | wxFILE_MUST_EXIST); wxOPEN | wxFILE_MUST_EXIST);
@@ -513,6 +510,9 @@ void LifeFrame::OnNavigate(wxCommandEvent& event)
case ID_WEST: c = m_life->FindWest(); break; case ID_WEST: c = m_life->FindWest(); break;
case ID_EAST: c = m_life->FindEast(); break; case ID_EAST: c = m_life->FindEast(); break;
case ID_CENTER: c = m_life->FindCenter(); break; case ID_CENTER: c = m_life->FindCenter(); break;
default :
wxFAIL;
// Fall through!
case ID_ORIGIN: c.i = c.j = 0; break; case ID_ORIGIN: c.i = c.j = 0; break;
} }
@@ -552,7 +552,7 @@ void LifeFrame::OnStart()
if (!m_running) if (!m_running)
{ {
m_timer->Start(m_interval); m_timer->Start(m_interval);
m_running = TRUE; m_running = true;
UpdateUI(); UpdateUI();
} }
} }
@@ -562,8 +562,8 @@ void LifeFrame::OnStop()
if (m_running) if (m_running)
{ {
m_timer->Stop(); m_timer->Stop();
m_running = FALSE; m_running = false;
m_topspeed = FALSE; m_topspeed = false;
UpdateUI(); UpdateUI();
} }
} }
@@ -585,13 +585,13 @@ void LifeFrame::OnStep()
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
LifeNavigator::LifeNavigator(wxWindow *parent) LifeNavigator::LifeNavigator(wxWindow *parent)
: wxMiniFrame(parent, -1, : wxMiniFrame(parent, wxID_ANY,
_("Navigation"), _("Navigation"),
wxDefaultPosition, wxDefaultPosition,
wxDefaultSize, wxDefaultSize,
wxCAPTION | wxSIMPLE_BORDER) wxCAPTION | wxSIMPLE_BORDER)
{ {
wxPanel *panel = new wxPanel(this, -1); wxPanel *panel = new wxPanel(this, wxID_ANY);
wxBoxSizer *sizer1 = new wxBoxSizer(wxVERTICAL); wxBoxSizer *sizer1 = new wxBoxSizer(wxVERTICAL);
wxBoxSizer *sizer2 = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer *sizer2 = new wxBoxSizer(wxHORIZONTAL);
@@ -637,7 +637,6 @@ LifeNavigator::LifeNavigator(wxWindow *parent)
// set the panel and miniframe size // set the panel and miniframe size
panel->SetSizer(sizer1); panel->SetSizer(sizer1);
panel->SetAutoLayout(TRUE);
sizer1->Fit(panel); sizer1->Fit(panel);
SetClientSize(panel->GetSize()); SetClientSize(panel->GetSize());
@@ -654,7 +653,7 @@ LifeNavigator::LifeNavigator(wxWindow *parent)
Move(x, y); Move(x, y);
// done // done
Show(TRUE); Show(true);
} }
void LifeNavigator::OnClose(wxCloseEvent& event) void LifeNavigator::OnClose(wxCloseEvent& event)
@@ -673,7 +672,7 @@ void LifeNavigator::OnClose(wxCloseEvent& event)
// canvas constructor // canvas constructor
LifeCanvas::LifeCanvas(wxWindow *parent, Life *life, bool interactive) LifeCanvas::LifeCanvas(wxWindow *parent, Life *life, bool interactive)
: wxWindow(parent, -1, wxPoint(0, 0), wxSize(100, 100), : wxWindow(parent, wxID_ANY, wxDefaultPosition, wxSize(100, 100),
wxSUNKEN_BORDER) wxSUNKEN_BORDER)
{ {
m_life = life; m_life = life;
@@ -704,7 +703,7 @@ void LifeCanvas::Recenter(wxInt32 i, wxInt32 j)
m_viewportY = j - m_viewportH / 2; m_viewportY = j - m_viewportH / 2;
// redraw everything // redraw everything
Refresh(FALSE); Refresh(false);
} }
// set the cell size and refresh display // set the cell size and refresh display
@@ -735,7 +734,7 @@ void LifeCanvas::SetCellSize(int cellsize)
m_thumbY = m_viewportH; m_thumbY = m_viewportH;
} }
Refresh(FALSE); Refresh(false);
} }
// draw a cell // draw a cell
@@ -777,13 +776,13 @@ void LifeCanvas::DrawChanged()
size_t ncells; size_t ncells;
LifeCell *cells; LifeCell *cells;
bool done = FALSE; bool done = false;
m_life->BeginFind(m_viewportX, m_life->BeginFind(m_viewportX,
m_viewportY, m_viewportY,
m_viewportX + m_viewportW, m_viewportX + m_viewportW,
m_viewportY + m_viewportH, m_viewportY + m_viewportH,
TRUE); true);
dc.BeginDrawing(); dc.BeginDrawing();
@@ -829,10 +828,9 @@ void LifeCanvas::OnPaint(wxPaintEvent& WXUNUSED(event))
size_t ncells; size_t ncells;
LifeCell *cells; LifeCell *cells;
bool done = FALSE;
m_life->BeginFind(i0, j0, i1, j1, FALSE); m_life->BeginFind(i0, j0, i1, j1, false);
done = m_life->FindMore(&cells, &ncells); bool done = m_life->FindMore(&cells, &ncells);
// erase all damaged cells and draw the grid // erase all damaged cells and draw the grid
dc.BeginDrawing(); dc.BeginDrawing();