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

Enhanced stock labels usage. Source cleaning.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31677 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-01-31 18:18:18 +00:00
parent faa9724741
commit 5d2ac6b8c6
21 changed files with 140 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
demos/life/game.cpp
View File

@@ -114,9 +114,9 @@ bool LifeCellBox::SetCell(int dx, int dy, bool alive)
Life::Life()
{
// pattern description
m_name = _("");
m_rules = _("");
m_description = _("");
m_name = wxEmptyString;
m_rules = wxEmptyString;
m_description = wxEmptyString;
// pattern data
m_numcells = 0;
@@ -173,9 +173,9 @@ void Life::Clear()
m_available = NULL;
// reset state
m_name = _("");
m_rules = _("");
m_description = _("");
m_name = wxEmptyString;
m_rules = wxEmptyString;
m_description = wxEmptyString;
m_numcells = 0;
}
@@ -403,7 +403,7 @@ LifeCell Life::FindNorth()
y = c->m_y;
first = false;
}
LifeCell cell;
cell.i = first? 0 : x + CELLBOX / 2;
cell.j = first? 0 : y + CELLBOX / 2;
@@ -423,7 +423,7 @@ LifeCell Life::FindSouth()
y = c->m_y;
first = false;
}
LifeCell cell;
cell.i = first? 0 : x + CELLBOX / 2;
cell.j = first? 0 : y + CELLBOX / 2;
@@ -443,7 +443,7 @@ LifeCell Life::FindWest()
y = c->m_y;
first = false;
}
LifeCell cell;
cell.i = first? 0 : x + CELLBOX / 2;
cell.j = first? 0 : y + CELLBOX / 2;
@@ -463,7 +463,7 @@ LifeCell Life::FindEast()
y = c->m_y;
first = false;
}
LifeCell cell;
cell.i = first? 0 : x + CELLBOX / 2;
cell.j = first? 0 : y + CELLBOX / 2;
@@ -870,7 +870,7 @@ bool Life::NextTic()
t2 |= g_tab[ ((t4 & 0x0000ffff) << 4 ) + ((t3 >> 24) & 0xf) ] << 24;
t2 |= g_tab[ ((t4 & 0xffff0000) >> 12) + ((t3 >> 28) & 0xf) ] << 28;
c->m_on[0] = c->m_on[1] = c->m_on[2] = c->m_on[3] =
c->m_on[0] = c->m_on[1] = c->m_on[2] = c->m_on[3] =
c->m_on[4] = c->m_on[5] = c->m_on[6] = c->m_on[7] = 0;
c->m_live1 = t1;
c->m_live2 = t2;
@@ -1136,7 +1136,7 @@ int g_tab1[]=
0x11112110,
0x11112121,
0x11112221,
0x11112232,
0x11112232,
0x11122100,
0x11122111,
0x11122211,

8
demos/life/game.h
View File

@@ -47,8 +47,8 @@ public:
m_rules = rules;
m_shape = shape;
};
// A more convenient ctor for the built-in samples
// A more convenient ctor for the built-in samples
LifePattern(wxString name,
wxString description,
int width,
@@ -57,7 +57,7 @@ public:
{
m_name = name;
m_description = description;
m_rules = _("");
m_rules = wxEmptyString;
m_shape.Add( wxString::Format(_T("%i %i"), -width/2, -height/2) );
for(int j = 0; j < height; j++)
{
@@ -88,7 +88,7 @@ struct LifeCell
{
wxInt32 i;
wxInt32 j;
};
};
// A private class that contains data about a block of cells
class LifeCellBox;

94
demos/life/life.cpp
View File

@@ -31,6 +31,7 @@
#include "wx/statline.h"
#include "wx/wfstream.h"
#include "wx/filedlg.h"
#include "wx/stockitem.h"
#include "life.h"
#include "game.h"
@@ -84,14 +85,11 @@ enum
ID_SOUTH,
ID_EAST,
ID_WEST,
ID_ZOOMIN,
ID_ZOOMOUT,
ID_INFO,
// game menu
ID_START,
ID_STEP,
ID_STOP,
ID_TOPSPEED,
// speed selection slider
@@ -104,28 +102,28 @@ enum
// Event tables
BEGIN_EVENT_TABLE(LifeFrame, wxFrame)
EVT_MENU (wxID_NEW, LifeFrame::OnMenu)
EVT_MENU (wxID_OPEN, LifeFrame::OnOpen)
EVT_MENU (ID_SAMPLES, LifeFrame::OnSamples)
EVT_MENU (wxID_ABOUT, LifeFrame::OnMenu)
EVT_MENU (wxID_EXIT, LifeFrame::OnMenu)
EVT_MENU (ID_SHOWNAV, LifeFrame::OnMenu)
EVT_MENU (ID_ORIGIN, LifeFrame::OnNavigate)
EVT_BUTTON (ID_CENTER, LifeFrame::OnNavigate)
EVT_BUTTON (ID_NORTH, LifeFrame::OnNavigate)
EVT_BUTTON (ID_SOUTH, LifeFrame::OnNavigate)
EVT_BUTTON (ID_EAST, LifeFrame::OnNavigate)
EVT_BUTTON (ID_WEST, LifeFrame::OnNavigate)
EVT_MENU (ID_ZOOMIN, LifeFrame::OnZoom)
EVT_MENU (ID_ZOOMOUT, LifeFrame::OnZoom)
EVT_MENU (ID_INFO, LifeFrame::OnMenu)
EVT_MENU (ID_START, LifeFrame::OnMenu)
EVT_MENU (ID_STEP, LifeFrame::OnMenu)
EVT_MENU (ID_STOP, LifeFrame::OnMenu)
EVT_MENU (ID_TOPSPEED, LifeFrame::OnMenu)
EVT_COMMAND_SCROLL (ID_SLIDER, LifeFrame::OnSlider)
EVT_TIMER (ID_TIMER, LifeFrame::OnTimer)
EVT_CLOSE ( LifeFrame::OnClose)
EVT_MENU (wxID_NEW, LifeFrame::OnMenu)
EVT_MENU (wxID_OPEN, LifeFrame::OnOpen)
EVT_MENU (ID_SAMPLES, LifeFrame::OnSamples)
EVT_MENU (wxID_ABOUT, LifeFrame::OnMenu)
EVT_MENU (wxID_EXIT, LifeFrame::OnMenu)
EVT_MENU (ID_SHOWNAV, LifeFrame::OnMenu)
EVT_MENU (ID_ORIGIN, LifeFrame::OnNavigate)
EVT_BUTTON (ID_CENTER, LifeFrame::OnNavigate)
EVT_BUTTON (ID_NORTH, LifeFrame::OnNavigate)
EVT_BUTTON (ID_SOUTH, LifeFrame::OnNavigate)
EVT_BUTTON (ID_EAST, LifeFrame::OnNavigate)
EVT_BUTTON (ID_WEST, LifeFrame::OnNavigate)
EVT_MENU (wxID_ZOOM_IN, LifeFrame::OnZoom)
EVT_MENU (wxID_ZOOM_OUT,LifeFrame::OnZoom)
EVT_MENU (ID_INFO, LifeFrame::OnMenu)
EVT_MENU (ID_START, LifeFrame::OnMenu)
EVT_MENU (ID_STEP, LifeFrame::OnMenu)
EVT_MENU (wxID_STOP, LifeFrame::OnMenu)
EVT_MENU (ID_TOPSPEED, LifeFrame::OnMenu)
EVT_COMMAND_SCROLL (ID_SLIDER, LifeFrame::OnSlider)
EVT_TIMER (ID_TIMER, LifeFrame::OnTimer)
EVT_CLOSE ( LifeFrame::OnClose)
END_EVENT_TABLE()
BEGIN_EVENT_TABLE(LifeNavigator, wxMiniFrame)
@@ -197,11 +195,11 @@ LifeFrame::LifeFrame() : wxFrame( (wxFrame *) NULL, wxID_ANY,
wxMenu *menuGame = new wxMenu(wxMENU_TEAROFF);
wxMenu *menuHelp = new wxMenu(wxMENU_TEAROFF);
menuFile->Append(wxID_NEW, _("&New"), _("Start a new game"));
menuFile->Append(wxID_OPEN, _("&Open..."), _("Open an existing Life pattern"));
menuFile->Append(wxID_NEW, wxGetStockLabel(wxID_NEW), _("Start a new game"));
menuFile->Append(wxID_OPEN, wxGetStockLabel(wxID_OPEN), _("Open an existing Life pattern"));
menuFile->Append(ID_SAMPLES, _("&Sample game..."), _("Select a sample configuration"));
menuFile->AppendSeparator();
menuFile->Append(wxID_EXIT, _("E&xit\tAlt-X"), _("Quit this program"));
menuFile->Append(wxID_EXIT, wxGetStockLabel(wxID_EXIT, true, _T("Alt-X")), _("Quit this program"));
menuView->Append(ID_SHOWNAV, _("Navigation &toolbox"), _("Show or hide toolbox"), wxITEM_CHECK);
menuView->Check(ID_SHOWNAV, true);
@@ -213,14 +211,14 @@ LifeFrame::LifeFrame() : wxFrame( (wxFrame *) NULL, wxID_ANY,
menuView->Append(ID_EAST, _("&East"), _("Find easternmost cell"));
menuView->Append(ID_WEST, _("&West"), _("Find westernmost cell"));
menuView->AppendSeparator();
menuView->Append(ID_ZOOMIN, _("Zoom &in\tCtrl-I"), _("Zoom in"));
menuView->Append(ID_ZOOMOUT, _("Zoom &out\tCtrl-O"), _("Zoom out"));
menuView->Append(wxID_ZOOM_IN, wxGetStockLabel(wxID_ZOOM_IN, true, _T("Ctrl-I")), _("Zoom in"));
menuView->Append(wxID_ZOOM_OUT, wxGetStockLabel(wxID_ZOOM_OUT, true, _T("Ctrl-O")), _("Zoom out"));
menuView->Append(ID_INFO, _("&Description\tCtrl-D"), _("View pattern description"));
menuGame->Append(ID_START, _("&Start\tCtrl-S"), _("Start"));
menuGame->Append(ID_STEP, _("&Next\tCtrl-N"), _("Single step"));
menuGame->Append(ID_STOP, _("S&top\tCtrl-T"), _("Stop"));
menuGame->Enable(ID_STOP, false);
menuGame->Append(wxID_STOP, wxGetStockLabel(wxID_STOP, true, _T("Ctrl-T")), _("Stop"));
menuGame->Enable(wxID_STOP, false);
menuGame->AppendSeparator();
menuGame->Append(ID_TOPSPEED, _("T&op speed!"), _("Go as fast as possible"));
@@ -248,18 +246,18 @@ LifeFrame::LifeFrame() : wxFrame( (wxFrame *) NULL, wxID_ANY,
toolBar->SetMargins(5, 5);
toolBar->SetToolBitmapSize(wxSize(16, 16));
ADD_TOOL(wxID_NEW, tbBitmaps[0], _("New"), _("Start a new game"));
ADD_TOOL(wxID_OPEN, tbBitmaps[1], _("Open"), _("Open an existing Life pattern"));
ADD_TOOL(wxID_NEW, tbBitmaps[0], wxGetStockLabel(wxID_NEW, false), _("Start a new game"));
ADD_TOOL(wxID_OPEN, tbBitmaps[1], wxGetStockLabel(wxID_OPEN, false), _("Open an existing Life pattern"));
toolBar->AddSeparator();
ADD_TOOL(ID_ZOOMIN, tbBitmaps[2], _("Zoom in"), _("Zoom in"));
ADD_TOOL(ID_ZOOMOUT, tbBitmaps[3], _("Zoom out"), _("Zoom out"));
ADD_TOOL(wxID_ZOOM_IN, tbBitmaps[2], wxGetStockLabel(wxID_ZOOM_IN, false), _("Zoom in"));
ADD_TOOL(wxID_ZOOM_OUT, tbBitmaps[3], wxGetStockLabel(wxID_ZOOM_OUT, false), _("Zoom out"));
ADD_TOOL(ID_INFO, tbBitmaps[4], _("Description"), _("Show description"));
toolBar->AddSeparator();
ADD_TOOL(ID_START, tbBitmaps[5], _("Start"), _("Start"));
ADD_TOOL(ID_STOP, tbBitmaps[6], _("Stop"), _("Stop"));
ADD_TOOL(wxID_STOP, tbBitmaps[6], wxGetStockLabel(wxID_STOP, false), _("Stop"));
toolBar->Realize();
toolBar->EnableTool(ID_STOP, false); // must be after Realize() !
toolBar->EnableTool(wxID_STOP, false); // must be after Realize() !
#if wxUSE_STATUSBAR
// status bar
@@ -357,18 +355,18 @@ void LifeFrame::UpdateUI()
{
// start / stop
GetToolBar()->EnableTool(ID_START, !m_running);
GetToolBar()->EnableTool(ID_STOP, m_running);
GetToolBar()->EnableTool(wxID_STOP, m_running);
GetMenuBar()->Enable(ID_START, !m_running);
GetMenuBar()->Enable(ID_STEP, !m_running);
GetMenuBar()->Enable(ID_STOP, m_running);
GetMenuBar()->Enable(wxID_STOP, m_running);
GetMenuBar()->Enable(ID_TOPSPEED, !m_topspeed);
// zooming
int cellsize = m_canvas->GetCellSize();
GetToolBar()->EnableTool(ID_ZOOMIN, cellsize < 32);
GetToolBar()->EnableTool(ID_ZOOMOUT, cellsize > 1);
GetMenuBar()->Enable(ID_ZOOMIN, cellsize < 32);
GetMenuBar()->Enable(ID_ZOOMOUT, cellsize > 1);
GetToolBar()->EnableTool(wxID_ZOOM_IN, cellsize < 32);
GetToolBar()->EnableTool(wxID_ZOOM_OUT, cellsize > 1);
GetMenuBar()->Enable(wxID_ZOOM_IN, cellsize < 32);
GetMenuBar()->Enable(wxID_ZOOM_OUT, cellsize > 1);
}
// Event handlers -----------------------------------------------------------
@@ -410,7 +408,7 @@ void LifeFrame::OnMenu(wxCommandEvent& event)
{
wxString desc = m_life->GetDescription();
if ( desc.IsEmpty() )
if ( desc.empty() )
desc = _("Not available");
// should we make the description editable here?
@@ -420,7 +418,7 @@ void LifeFrame::OnMenu(wxCommandEvent& event)
}
case ID_START : OnStart(); break;
case ID_STEP : OnStep(); break;
case ID_STOP : OnStop(); break;
case wxID_STOP : OnStop(); break;
case ID_TOPSPEED:
{
m_running = true;
@@ -493,12 +491,12 @@ void LifeFrame::OnZoom(wxCommandEvent& event)
{
int cellsize = m_canvas->GetCellSize();
if ((event.GetId() == ID_ZOOMIN) && cellsize < 32)
if ((event.GetId() == wxID_ZOOM_IN) && cellsize < 32)
{
m_canvas->SetCellSize(cellsize * 2);
UpdateUI();
}
else if ((event.GetId() == ID_ZOOMOUT) && cellsize > 1)
else if ((event.GetId() == wxID_ZOOM_OUT) && cellsize > 1)
{
m_canvas->SetCellSize(cellsize / 2);
UpdateUI();

8
demos/life/life.h
View File

@@ -92,9 +92,9 @@ private:
wxInt32 m_viewportY; // first visible cell (y coord)
wxInt32 m_viewportW; // number of visible cells (w)
wxInt32 m_viewportH; // number of visible cells (h)
int m_thumbX; // horiz. scrollbar thumb position
int m_thumbY; // vert. scrollbar thumb position
wxInt32 m_mi, m_mj; // last mouse position
int m_thumbX; // horiz. scrollbar thumb position
int m_thumbY; // vert. scrollbar thumb position
wxInt32 m_mi, m_mj; // last mouse position
};
@@ -151,7 +151,7 @@ private:
void OnStop();
void OnStep();
Life *m_life;
Life *m_life;
LifeCanvas *m_canvas;
LifeNavigator *m_navigator;
wxStaticText *m_text;

6
demos/life/reader.cpp
View File

@@ -47,7 +47,7 @@ LifeReader::LifeReader(wxInputStream& is)
{
wxBufferedInputStream buff_is(is);
wxTextInputStream text_is(buff_is);
wxString line, rest;
wxString line, rest;
// check stream
m_ok = is.IsOk();
@@ -58,7 +58,7 @@ LifeReader::LifeReader(wxInputStream& is)
LIFE_CHECKVAL(_("Error reading signature. Not a Life pattern?"));
// read description
m_description = wxT("");
m_description = wxEmptyString;
line = text_is.ReadLine();
while (buff_is.IsOk() && line.StartsWith(wxT("#D"), &rest))
{
@@ -79,7 +79,7 @@ LifeReader::LifeReader(wxInputStream& is)
{
line = ( text_is.ReadLine() ).Trim();
if (!line.IsEmpty())
if (!line.empty())
{
if (line.StartsWith(wxT("#P "), &rest))
m_shape.Add(rest);

2
demos/life/reader.h
View File

@@ -45,7 +45,7 @@ public:
inline wxArrayString GetShape() const { return m_shape; };
inline LifePattern GetPattern() const
{
return LifePattern(_(""), m_description, m_rules, m_shape);
return LifePattern(wxEmptyString, m_description, m_rules, m_shape);
};
private: