Patch [ 584078 ] Misc samples fixes from Dimitri Schoolwerth
Addresses: printf-format warinigs indentation/style unused variable warnings used wxID_ABOUT for about menu entry removed references to "minimal sample" in other samples some other misc warinigs git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16339 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
@@ -37,45 +37,44 @@
|
||||
class MyApp: public wxApp
|
||||
{
|
||||
public:
|
||||
virtual bool OnInit();
|
||||
virtual bool OnInit();
|
||||
|
||||
protected:
|
||||
wxLocale m_locale; // locale we'll be using
|
||||
wxLocale m_locale; // locale we'll be using
|
||||
};
|
||||
|
||||
// Define a new frame type
|
||||
class MyFrame: public wxFrame
|
||||
{
|
||||
{
|
||||
public:
|
||||
MyFrame(wxFrame *frame, const wxChar *title, int x, int y, int w, int h,
|
||||
wxLocale& m_locale);
|
||||
MyFrame(wxFrame *frame, const wxChar *title,
|
||||
const wxPoint& pos, const wxSize& size, wxLocale& m_locale);
|
||||
|
||||
public:
|
||||
void OnQuit(wxCommandEvent& event);
|
||||
void OnAbout(wxCommandEvent& event);
|
||||
void OnPlay(wxCommandEvent& event);
|
||||
void OnOpen(wxCommandEvent& event);
|
||||
void OnQuit(wxCommandEvent& event);
|
||||
void OnAbout(wxCommandEvent& event);
|
||||
void OnPlay(wxCommandEvent& event);
|
||||
void OnOpen(wxCommandEvent& event);
|
||||
|
||||
DECLARE_EVENT_TABLE()
|
||||
|
||||
wxLocale& m_locale;
|
||||
DECLARE_EVENT_TABLE()
|
||||
|
||||
wxLocale& m_locale;
|
||||
};
|
||||
|
||||
// ID for the menu commands
|
||||
enum
|
||||
{
|
||||
MINIMAL_QUIT = 1,
|
||||
MINIMAL_TEXT,
|
||||
MINIMAL_ABOUT,
|
||||
MINIMAL_TEST,
|
||||
MINIMAL_OPEN
|
||||
MINIMAL_QUIT = 1,
|
||||
MINIMAL_TEXT,
|
||||
MINIMAL_TEST,
|
||||
MINIMAL_OPEN
|
||||
};
|
||||
|
||||
BEGIN_EVENT_TABLE(MyFrame, wxFrame)
|
||||
EVT_MENU(MINIMAL_QUIT, MyFrame::OnQuit)
|
||||
EVT_MENU(MINIMAL_ABOUT, MyFrame::OnAbout)
|
||||
EVT_MENU(MINIMAL_TEST, MyFrame::OnPlay)
|
||||
EVT_MENU(MINIMAL_OPEN, MyFrame::OnOpen)
|
||||
EVT_MENU(MINIMAL_QUIT, MyFrame::OnQuit)
|
||||
EVT_MENU(wxID_ABOUT, MyFrame::OnAbout)
|
||||
EVT_MENU(MINIMAL_TEST, MyFrame::OnPlay)
|
||||
EVT_MENU(MINIMAL_OPEN, MyFrame::OnOpen)
|
||||
END_EVENT_TABLE()
|
||||
|
||||
IMPLEMENT_APP(MyApp)
|
||||
@@ -84,131 +83,133 @@ IMPLEMENT_APP(MyApp)
|
||||
// `Main program' equivalent, creating windows and returning main app frame
|
||||
bool MyApp::OnInit()
|
||||
{
|
||||
const wxString langs[] =
|
||||
{
|
||||
_T("(System default)"),
|
||||
_T("French"),
|
||||
_T("German"),
|
||||
_T("Russian"),
|
||||
_T("English"),
|
||||
_T("English (U.S.)")
|
||||
};
|
||||
const wxString langs[] =
|
||||
{
|
||||
_T("(System default)"),
|
||||
_T("French"),
|
||||
_T("German"),
|
||||
_T("Russian"),
|
||||
_T("English"),
|
||||
_T("English (U.S.)")
|
||||
};
|
||||
|
||||
SetExitOnFrameDelete(FALSE);
|
||||
int lng = wxGetSingleChoiceIndex(_T("Please choose language:"), _T("Language"),
|
||||
SetExitOnFrameDelete(FALSE);
|
||||
int lng = wxGetSingleChoiceIndex(_T("Please choose language:"), _T("Language"),
|
||||
WXSIZEOF(langs), langs);
|
||||
SetExitOnFrameDelete(TRUE);
|
||||
SetExitOnFrameDelete(TRUE);
|
||||
|
||||
switch (lng)
|
||||
{
|
||||
case 0 : m_locale.Init(wxLANGUAGE_DEFAULT); break;
|
||||
case 1 : m_locale.Init(wxLANGUAGE_FRENCH); break;
|
||||
case 2 : m_locale.Init(wxLANGUAGE_GERMAN); break;
|
||||
case 3 : m_locale.Init(wxLANGUAGE_RUSSIAN); break;
|
||||
case 4 : m_locale.Init(wxLANGUAGE_ENGLISH); break;
|
||||
case -1:
|
||||
case 5 : m_locale.Init(wxLANGUAGE_ENGLISH_US); break;
|
||||
}
|
||||
switch (lng)
|
||||
{
|
||||
case 0 : m_locale.Init(wxLANGUAGE_DEFAULT); break;
|
||||
case 1 : m_locale.Init(wxLANGUAGE_FRENCH); break;
|
||||
case 2 : m_locale.Init(wxLANGUAGE_GERMAN); break;
|
||||
case 3 : m_locale.Init(wxLANGUAGE_RUSSIAN); break;
|
||||
case 4 : m_locale.Init(wxLANGUAGE_ENGLISH); break;
|
||||
case -1:
|
||||
case 5 : m_locale.Init(wxLANGUAGE_ENGLISH_US); break;
|
||||
}
|
||||
|
||||
// Initialize the catalogs we'll be using
|
||||
/* not needed any more, done in wxLocale ctor
|
||||
m_locale.AddCatalog("wxstd"); // 1) for library messages
|
||||
*/
|
||||
m_locale.AddCatalog(wxT("internat")); // 2) our private one
|
||||
/* this catalog is installed in standard location on Linux systems,
|
||||
// Initialize the catalogs we'll be using
|
||||
/* not needed any more, done in wxLocale ctor
|
||||
m_locale.AddCatalog("wxstd"); // 1) for library messages
|
||||
*/
|
||||
m_locale.AddCatalog(wxT("internat")); // 2) our private one
|
||||
/* this catalog is installed in standard location on Linux systems,
|
||||
it might not be installed on yours - just ignore the errrors
|
||||
or comment out this line then */
|
||||
#ifdef __LINUX__
|
||||
{
|
||||
{
|
||||
wxLogNull noLog;
|
||||
m_locale.AddCatalog("fileutils"); // 3) and another just for testing
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
// Create the main frame window
|
||||
MyFrame *frame = new MyFrame((wxFrame *) NULL, _("International wxWindows App"),
|
||||
50, 50, 350, 60, m_locale);
|
||||
|
||||
// Give it an icon
|
||||
frame->SetIcon(wxICON(mondrian));
|
||||
// Create the main frame window
|
||||
MyFrame *frame = new MyFrame( (wxFrame *) NULL,
|
||||
_("International wxWindows App"), wxPoint(50, 50), wxSize(350, 60),
|
||||
m_locale);
|
||||
|
||||
// Make a menubar
|
||||
wxMenu *file_menu = new wxMenu;
|
||||
file_menu->Append(MINIMAL_ABOUT, _("&About..."));
|
||||
file_menu->AppendSeparator();
|
||||
file_menu->Append(MINIMAL_QUIT, _("E&xit"));
|
||||
// Give it an icon
|
||||
frame->SetIcon(wxICON(mondrian));
|
||||
|
||||
wxMenu *test_menu = new wxMenu;
|
||||
test_menu->Append(MINIMAL_OPEN, _("&Open bogus file"));
|
||||
test_menu->Append(MINIMAL_TEST, _("&Play a game"));
|
||||
// Make a menubar
|
||||
wxMenu *file_menu = new wxMenu;
|
||||
file_menu->Append(wxID_ABOUT, _("&About..."));
|
||||
file_menu->AppendSeparator();
|
||||
file_menu->Append(MINIMAL_QUIT, _("E&xit"));
|
||||
|
||||
wxMenuBar *menu_bar = new wxMenuBar;
|
||||
menu_bar->Append(file_menu, _("&File"));
|
||||
menu_bar->Append(test_menu, _("&Test"));
|
||||
frame->SetMenuBar(menu_bar);
|
||||
wxMenu *test_menu = new wxMenu;
|
||||
test_menu->Append(MINIMAL_OPEN, _("&Open bogus file"));
|
||||
test_menu->Append(MINIMAL_TEST, _("&Play a game"));
|
||||
|
||||
// Show the frame
|
||||
frame->Show(TRUE);
|
||||
SetTopWindow(frame);
|
||||
wxMenuBar *menu_bar = new wxMenuBar;
|
||||
menu_bar->Append(file_menu, _("&File"));
|
||||
menu_bar->Append(test_menu, _("&Test"));
|
||||
frame->SetMenuBar(menu_bar);
|
||||
|
||||
return TRUE;
|
||||
// Show the frame
|
||||
frame->Show(TRUE);
|
||||
SetTopWindow(frame);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
// My frame constructor
|
||||
MyFrame::MyFrame(wxFrame *frame, const wxChar *title, int x, int y,
|
||||
int w, int h, wxLocale& l)
|
||||
: wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h)),
|
||||
MyFrame::MyFrame(wxFrame *frame, const wxChar *title,
|
||||
const wxPoint& pos, const wxSize& size, wxLocale& l)
|
||||
: wxFrame(frame, -1, title, pos, size),
|
||||
m_locale(l)
|
||||
{
|
||||
// Empty
|
||||
}
|
||||
|
||||
void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) )
|
||||
{
|
||||
Close(TRUE);
|
||||
Close(TRUE);
|
||||
}
|
||||
|
||||
void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
|
||||
{
|
||||
wxString localeInfo;
|
||||
localeInfo.Printf(_("Language: %s\nSystem locale name: %s\nCanonical locale name: %s\n"),
|
||||
m_locale.GetLocale(),
|
||||
m_locale.GetSysName().c_str(),
|
||||
m_locale.GetCanonicalName().c_str());
|
||||
wxString localeInfo;
|
||||
localeInfo.Printf( _("Language: %s\nSystem locale name: %s\nCanonical locale name: %s\n"),
|
||||
m_locale.GetLocale(),
|
||||
m_locale.GetSysName().c_str(),
|
||||
m_locale.GetCanonicalName().c_str() );
|
||||
|
||||
wxMessageDialog(this, wxString(_("I18n sample\n(c) 1998, 1999 Vadim Zeitlin and Julian Smart"))
|
||||
+ wxT("\n\n") + localeInfo,
|
||||
_("About Internat"), wxOK | wxICON_INFORMATION).ShowModal();
|
||||
wxMessageDialog(this, wxString(_("I18n sample\n(c) 1998, 1999 Vadim Zeitlin and Julian Smart"))
|
||||
+ wxT("\n\n") + localeInfo,
|
||||
_("About Internat"), wxOK | wxICON_INFORMATION).ShowModal();
|
||||
}
|
||||
|
||||
void MyFrame::OnPlay(wxCommandEvent& WXUNUSED(event))
|
||||
{
|
||||
wxString str = wxGetTextFromUser(_("Enter your number:"),
|
||||
_("Try to guess my number!"),
|
||||
"", this);
|
||||
if ( str.IsEmpty() )
|
||||
return;
|
||||
wxString str = wxGetTextFromUser(_("Enter your number:"),
|
||||
_("Try to guess my number!"), wxEmptyString, this);
|
||||
|
||||
int num;
|
||||
wxSscanf(str, wxT("%d"), &num);
|
||||
if ( num == 0 )
|
||||
str = _("You've probably entered an invalid number.");
|
||||
else if ( num == 9 ) // this message is not translated (not in catalog)
|
||||
str = "You've found a bug in this program!";
|
||||
else if ( num != 17 ) // a more implicit way to write _()
|
||||
str = wxGetTranslation(wxT("Bad luck! try again..."));
|
||||
else {
|
||||
str.Empty();
|
||||
// string must be split in two -- otherwise the translation won't be found
|
||||
str << _("Congratulations! you've won. Here is the magic phrase:")
|
||||
<< _("cannot create fifo `%s'");
|
||||
}
|
||||
if ( str.IsEmpty() ) return;
|
||||
|
||||
wxMessageBox(str, _("Result"), wxOK | wxICON_INFORMATION);
|
||||
int num;
|
||||
wxSscanf(str, wxT("%d"), &num);
|
||||
if ( num == 0 )
|
||||
str = _("You've probably entered an invalid number.");
|
||||
else if ( num == 9 ) // this message is not translated (not in catalog)
|
||||
str = "You've found a bug in this program!";
|
||||
else if ( num != 17 ) // a more implicit way to write _()
|
||||
str = wxGetTranslation(wxT("Bad luck! try again..."));
|
||||
else
|
||||
{
|
||||
str.Empty();
|
||||
// string must be split in two -- otherwise the translation won't be found
|
||||
str << _("Congratulations! you've won. Here is the magic phrase:")
|
||||
<< _("cannot create fifo `%s'");
|
||||
}
|
||||
|
||||
wxMessageBox(str, _("Result"), wxOK | wxICON_INFORMATION);
|
||||
}
|
||||
|
||||
void MyFrame::OnOpen(wxCommandEvent&)
|
||||
{
|
||||
// open a bogus file -- the error message should be also translated if you've
|
||||
// got wxstd.mo somewhere in the search path
|
||||
wxFile file(wxT("NOTEXIST.ING"));
|
||||
// open a bogus file -- the error message should be also translated if you've
|
||||
// got wxstd.mo somewhere in the search path
|
||||
wxFile file(wxT("NOTEXIST.ING"));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user