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

12
demos/forty/canvas.cpp
View File

@@ -137,7 +137,7 @@ void FortyCanvas::ShowPlayerDialog()
int wins, games, score;
m_scoreFile->ReadPlayersScore(m_player, wins, games, score);
m_game->NewPlayer(wins, games, score);
wxClientDC dc(this);
dc.SetFont(* m_font);
m_game->DisplayScore(dc);
@@ -152,7 +152,7 @@ void FortyCanvas::ShowPlayerDialog()
}
}
}
/*
Called when the main frame is closed
*/
@@ -172,7 +172,7 @@ void FortyCanvas::OnMouseEvent(wxMouseEvent& event)
int mouseX = (int)event.GetX();
int mouseY = (int)event.GetY();
wxClientDC dc(this);
wxClientDC dc(this);
PrepareDC(dc);
dc.SetFont(* m_font);
@@ -233,7 +233,7 @@ void FortyCanvas::OnMouseEvent(wxMouseEvent& event)
void FortyCanvas::SetCursorStyle(int x, int y)
{
// Only set cursor to a hand if 'helping hand' is enabled and
// the card under the cursor can go somewhere
// the card under the cursor can go somewhere
if (m_game->CanYouGo(x, y) && m_helpingHand)
{
SetCursor(* m_handCursor);
@@ -253,7 +253,7 @@ void FortyCanvas::NewGame()
void FortyCanvas::Undo()
{
wxClientDC dc(this);
wxClientDC dc(this);
PrepareDC(dc);
dc.SetFont(* m_font);
m_game->Undo(dc);
@@ -261,7 +261,7 @@ void FortyCanvas::Undo()
void FortyCanvas::Redo()
{
wxClientDC dc(this);
wxClientDC dc(this);
PrepareDC(dc);
dc.SetFont(* m_font);
m_game->Redo(dc);

21
demos/forty/forty.cpp
View File

@@ -37,13 +37,15 @@
#include "wx/html/htmlwin.h"
#endif
#include "wx/stockitem.h"
BEGIN_EVENT_TABLE(FortyFrame, wxFrame)
EVT_MENU(NEW_GAME, FortyFrame::NewGame)
EVT_MENU(wxID_NEW, FortyFrame::NewGame)
EVT_MENU(wxID_EXIT, FortyFrame::Exit)
EVT_MENU(wxID_ABOUT, FortyFrame::About)
EVT_MENU(wxID_HELP_CONTENTS, FortyFrame::Help)
EVT_MENU(UNDO, FortyFrame::Undo)
EVT_MENU(REDO, FortyFrame::Redo)
EVT_MENU(wxID_UNDO, FortyFrame::Undo)
EVT_MENU(wxID_REDO, FortyFrame::Redo)
EVT_MENU(SCORES, FortyFrame::Scores)
EVT_MENU(RIGHT_BUTTON_UNDO, FortyFrame::ToggleRightButtonUndo)
EVT_MENU(HELPING_HAND, FortyFrame::ToggleHelpingHand)
@@ -151,13 +153,13 @@ FortyFrame::FortyFrame(wxFrame* frame, const wxString& title, const wxPoint& pos
// Make a menu bar
wxMenu* gameMenu = new wxMenu;
gameMenu->Append(NEW_GAME, _T("&New"), _T("Start a new game"));
gameMenu->Append(wxID_NEW, wxGetStockLabel(wxID_NEW), _T("Start a new game"));
gameMenu->Append(SCORES, _T("&Scores..."), _T("Displays scores"));
gameMenu->Append(wxID_EXIT, _T("E&xit"), _T("Exits Forty Thieves"));
gameMenu->Append(wxID_EXIT, wxGetStockLabel(wxID_EXIT), _T("Exits Forty Thieves"));
wxMenu* editMenu = new wxMenu;
editMenu->Append(UNDO, _T("&Undo"), _T("Undo the last move"));
editMenu->Append(REDO, _T("&Redo"), _T("Redo a move that has been undone"));
editMenu->Append(wxID_UNDO, wxGetStockLabel(wxID_UNDO), _T("Undo the last move"));
editMenu->Append(wxID_REDO, wxGetStockLabel(wxID_REDO), _T("Redo a move that has been undone"));
wxMenu* optionsMenu = new wxMenu;
optionsMenu->Append(RIGHT_BUTTON_UNDO,
@@ -308,6 +310,7 @@ FortyFrame::ToggleCardSize(wxCommandEvent& event)
//----------------------------------------------------------------------------
BEGIN_EVENT_TABLE(FortyAboutDialog,wxDialog)
EVT_BUTTON(wxID_CLOSE, wxDialog::OnOK)
END_EVENT_TABLE()
FortyAboutDialog::FortyAboutDialog( wxWindow *parent, wxWindowID id, const wxString &title,
@@ -336,7 +339,7 @@ bool FortyAboutDialog::AddControls(wxWindow* parent)
}
}
if (htmlText.IsEmpty())
if (htmlText.empty())
{
htmlText.Printf(wxT("<html><head><title>Warning</title></head><body><P>Sorry, could not find resource for About dialog<P></body></html>"));
}
@@ -366,7 +369,7 @@ bool FortyAboutDialog::AddControls(wxWindow* parent)
wxASSERT( item1 );
item0->Add( item1, 0, wxALIGN_CENTRE|wxALL, 5 );
wxButton *item2 = new wxButton( parent, wxID_CANCEL, _T("&Close"), wxDefaultPosition, wxDefaultSize, 0 );
wxButton *item2 = new wxButton( parent, wxID_CLOSE );
item2->SetDefault();
item2->SetFocus();

5
demos/forty/forty.h
View File

@@ -61,10 +61,7 @@ public:
private:
enum MenuCommands {
NEW_GAME = 10,
SCORES,
UNDO,
REDO,
SCORES = 10,
RIGHT_BUTTON_UNDO,
HELPING_HAND,
LARGE_CARDS

4
demos/forty/playerdg.cpp
View File

@@ -63,8 +63,8 @@ PlayerSelectionDialog::PlayerSelectionDialog(
m_textField = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize);
m_OK = new wxButton(this, wxID_OK, _T("OK"));
m_cancel = new wxButton(this, wxID_CANCEL, _T("Cancel"));
m_OK = new wxButton(this, wxID_OK);
m_cancel = new wxButton(this, wxID_CANCEL);
wxBoxSizer *button_sizer = new wxBoxSizer( wxHORIZONTAL );
button_sizer->Add( m_OK, 0, wxALL, 10 );

2
demos/forty/scoredg.cpp
View File

@@ -191,7 +191,7 @@ ScoreDialog::ScoreDialog(wxWindow* parent, ScoreFile* file) :
// locate and resize with sizers
wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
topsizer->Add( list, 1, wxALL|wxGROW, 10 );
wxButton *button = new wxButton(this, wxID_OK, _("OK"));
wxButton *button = new wxButton(this, wxID_OK);
topsizer->Add( button, 0, wxALIGN_CENTER_HORIZONTAL|wxALL , 10 );
button->SetFocus();