// Last modified: 22nd July 1998 - ported to wxWidgets 2.0
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation
-#pragma interface
-#endif
-
// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"
#include "forty.h"
#include "card.h"
#include "scoredg.h"
+#include "forty.xpm"
#if wxUSE_HTML
#include "wx/textfile.h"
#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)
wxColour* FortyApp::m_textColour = 0;
wxBrush* FortyApp::m_backgroundBrush = 0;
-FortyApp::FortyApp()
-{
-}
-
FortyApp::~FortyApp()
{
delete m_backgroundColour;
wxSize size(668,510);
- if ((argc > 1) && (!wxStrcmp(argv[1],_T("-L"))))
+ if ((argc > 1) && (!wxStrcmp(argv[1],wxT("-L"))))
{
largecards = true;
size = wxSize(1000,750);
FortyFrame* frame = new FortyFrame(
0,
- _T("Forty Thieves"),
+ wxT("Forty Thieves"),
wxDefaultPosition,
size,
largecards
{
if (!m_textColour)
{
- m_textColour = new wxColour(_T("BLACK"));
+ m_textColour = new wxColour(*wxBLACK);
}
return *m_textColour;
#endif
// set the icon
#ifdef __WXMSW__
- SetIcon(wxIcon(_T("CardsIcon")));
+ SetIcon(wxIcon(wxT("CardsIcon")));
#else
-#ifdef GTK_TBD
- SetIcon(wxIcon(Cards_bits, Cards_width, Cards_height));
-#endif
+ SetIcon(wxIcon(forty_xpm));
#endif
// Make a menu bar
wxMenu* gameMenu = new wxMenu;
- gameMenu->Append(NEW_GAME, _T("&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_NEW, wxGetStockLabel(wxID_NEW), wxT("Start a new game"));
+ gameMenu->Append(SCORES, wxT("&Scores..."), wxT("Displays scores"));
+ gameMenu->Append(wxID_EXIT, wxGetStockLabel(wxID_EXIT), wxT("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), wxT("Undo the last move"));
+ editMenu->Append(wxID_REDO, wxGetStockLabel(wxID_REDO), wxT("Redo a move that has been undone"));
wxMenu* optionsMenu = new wxMenu;
optionsMenu->Append(RIGHT_BUTTON_UNDO,
- _T("&Right button undo"),
- _T("Enables/disables right mouse button undo and redo"),
+ wxT("&Right button undo"),
+ wxT("Enables/disables right mouse button undo and redo"),
true
);
optionsMenu->Append(HELPING_HAND,
- _T("&Helping hand"),
- _T("Enables/disables hand cursor when a card can be moved"),
+ wxT("&Helping hand"),
+ wxT("Enables/disables hand cursor when a card can be moved"),
true
);
optionsMenu->Append(LARGE_CARDS,
- _T("&Large cards"),
- _T("Enables/disables large cards for high resolution displays"),
+ wxT("&Large cards"),
+ wxT("Enables/disables large cards for high resolution displays"),
true
);
optionsMenu->Check(HELPING_HAND, true);
optionsMenu->Check(LARGE_CARDS, largecards ? true : false);
wxMenu* helpMenu = new wxMenu;
- helpMenu->Append(wxID_HELP_CONTENTS, _T("&Help Contents"), _T("Displays information about playing the game"));
- helpMenu->Append(wxID_ABOUT, _T("&About..."), _T("About Forty Thieves"));
+ helpMenu->Append(wxID_HELP_CONTENTS, wxT("&Help Contents"), wxT("Displays information about playing the game"));
+ helpMenu->Append(wxID_ABOUT, wxT("&About..."), wxT("About Forty Thieves"));
m_menuBar = new wxMenuBar;
- m_menuBar->Append(gameMenu, _T("&Game"));
- m_menuBar->Append(editMenu, _T("&Edit"));
- m_menuBar->Append(optionsMenu, _T("&Options"));
- m_menuBar->Append(helpMenu, _T("&Help"));
+ m_menuBar->Append(gameMenu, wxT("&Game"));
+ m_menuBar->Append(editMenu, wxT("&Edit"));
+ m_menuBar->Append(optionsMenu, wxT("&Options"));
+ m_menuBar->Append(helpMenu, wxT("&Help"));
SetMenuBar(m_menuBar);
wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
topsizer->Add( m_canvas, 1, wxEXPAND | wxALL, 0);
SetSizer( topsizer );
- topsizer->SetSizeHints( this );
#if wxUSE_STATUSBAR
CreateStatusBar();
#endif // wxUSE_STATUSBAR
-}
-FortyFrame::~FortyFrame()
-{
+ topsizer->SetSizeHints( this );
}
void FortyFrame::OnCloseWindow(wxCloseEvent& event)
FortyFrame::About(wxCommandEvent&)
{
wxMessageBox(
- _T("Forty Thieves\n\n")
- _T("A free card game written with the wxWidgets toolkit\n")
- _T("Author: Chris Breeze (c) 1992-2004\n")
- _T("email: chris@breezesys.com"),
- _T("About Forty Thieves"),
+ wxT("Forty Thieves\n\n")
+ wxT("A free card game written with the wxWidgets toolkit\n")
+ wxT("Author: Chris Breeze (c) 1992-2004\n")
+ wxT("email: chris@breezesys.com"),
+ wxT("About Forty Thieves"),
wxOK|wxICON_INFORMATION, this
);
}
// stAboutDialog
//----------------------------------------------------------------------------
-BEGIN_EVENT_TABLE(FortyAboutDialog,wxDialog)
-END_EVENT_TABLE()
-
FortyAboutDialog::FortyAboutDialog( wxWindow *parent, wxWindowID id, const wxString &title,
const wxPoint &position, const wxSize& size, long style ) :
wxDialog( parent, id, title, position, size, style )
if (file.Exists())
{
file.Open();
- for ( htmlText = file.GetFirstLine();
- !file.Eof();
- htmlText << file.GetNextLine() << _T("\n") ) ;
+ for ( htmlText = file.GetFirstLine();
+ !file.Eof();
+ htmlText << file.GetNextLine() << wxT("\n") ) ;
}
}
- 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>"));
}
// Customize the HTML
- htmlText.Replace(wxT("$DATE$"), _T(__DATE__));
+ htmlText.Replace(wxT("$DATE$"), wxT(__DATE__));
wxSize htmlSize(400, 290);
wxHtmlWindow* html = new wxHtmlWindow(this, ID_ABOUT_HTML_WINDOW, wxDefaultPosition, htmlSize, borderStyle);
html -> SetBorders(10);
html -> SetPage(htmlText);
-
+
//// Start of sizer-based control creation
wxSizer *item0 = new wxBoxSizer( wxVERTICAL );
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();
+ SetAffirmativeId(wxID_CLOSE);
item0->Add( item2, 0, wxALIGN_RIGHT|wxALL, 5 );
return true;
}
-
projects / wxWidgets.git / blobdiff