X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/978af864269a739e77d9431c8465435e3f8f7407..05e0b047d879cdbfade7f2ab346c0acdf3e29f96:/samples/internat/internat.cpp?ds=sidebyside diff --git a/samples/internat/internat.cpp b/samples/internat/internat.cpp index 089ed4b3d0..a9d2233b4d 100644 --- a/samples/internat/internat.cpp +++ b/samples/internat/internat.cpp @@ -25,12 +25,13 @@ #endif #ifndef WX_PRECOMP -#include "wx/wx.h" + #include "wx/wx.h" #endif #include "wx/intl.h" #include "wx/file.h" #include "wx/log.h" +#include "wx/cmdline.h" #if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) #include "mondrian.xpm" @@ -44,10 +45,15 @@ class MyApp: public wxApp { public: + MyApp() { m_lang = wxLANGUAGE_UNKNOWN; } + + virtual void OnInitCmdLine(wxCmdLineParser& parser); + virtual bool OnCmdLineParsed(wxCmdLineParser& parser); virtual bool OnInit(); protected: - wxLocale m_locale; // locale we'll be using + wxLanguage m_lang; // language specified by user + wxLocale m_locale; // locale we'll be using }; // Define a new frame type @@ -57,8 +63,10 @@ public: MyFrame(wxLocale& m_locale); public: - void OnQuit(wxCommandEvent& event); + void OnTestLocaleAvail(wxCommandEvent& event); void OnAbout(wxCommandEvent& event); + void OnQuit(wxCommandEvent& event); + void OnPlay(wxCommandEvent& event); void OnOpen(wxCommandEvent& event); void OnTest1(wxCommandEvent& event); @@ -77,12 +85,11 @@ public: // ID for the menu commands enum { - INTERNAT_TEXT = wxID_HIGHEST + 1, - INTERNAT_TEST, + INTERNAT_TEST = wxID_HIGHEST + 1, + INTERNAT_PLAY, INTERNAT_TEST_1, INTERNAT_TEST_2, - INTERNAT_TEST_3, - INTERNAT_OPEN + INTERNAT_TEST_3 }; // language data @@ -141,10 +148,12 @@ wxCOMPILE_TIME_ASSERT( WXSIZEOF(langNames) == WXSIZEOF(langIds), // ---------------------------------------------------------------------------- BEGIN_EVENT_TABLE(MyFrame, wxFrame) - EVT_MENU(wxID_EXIT, MyFrame::OnQuit) + EVT_MENU(INTERNAT_TEST, MyFrame::OnTestLocaleAvail) EVT_MENU(wxID_ABOUT, MyFrame::OnAbout) - EVT_MENU(INTERNAT_TEST, MyFrame::OnPlay) - EVT_MENU(INTERNAT_OPEN, MyFrame::OnOpen) + EVT_MENU(wxID_EXIT, MyFrame::OnQuit) + + EVT_MENU(INTERNAT_PLAY, MyFrame::OnPlay) + EVT_MENU(wxID_OPEN, MyFrame::OnOpen) EVT_MENU(INTERNAT_TEST_1, MyFrame::OnTest1) EVT_MENU(INTERNAT_TEST_2, MyFrame::OnTest2) EVT_MENU(INTERNAT_TEST_3, MyFrame::OnTest3) @@ -160,37 +169,64 @@ IMPLEMENT_APP(MyApp) // MyApp // ---------------------------------------------------------------------------- -// `Main program' equivalent, creating windows and returning main app frame -bool MyApp::OnInit() +// command line arguments handling +void MyApp::OnInitCmdLine(wxCmdLineParser& parser) { - long lng = -1; + parser.AddParam(_("locale"), + wxCMD_LINE_VAL_STRING, + wxCMD_LINE_PARAM_OPTIONAL); - if ( argc == 2 ) + wxApp::OnInitCmdLine(parser); +} + +bool MyApp::OnCmdLineParsed(wxCmdLineParser& parser) +{ + if ( !wxApp::OnCmdLineParsed(parser) ) + return false; + + if ( parser.GetParamCount() ) { - // the parameter must be the lang index - wxString tmp(argv[1]); - tmp.ToLong(&lng); + const wxString loc = parser.GetParam(); + const wxLanguageInfo * const lang = wxLocale::FindLanguageInfo(loc); + if ( !lang ) + { + wxLogError(_("Locale \"%s\" is unknown."), loc); + return false; + } + + m_lang = wx_static_cast(wxLanguage, lang->Language); } - if ( lng == -1 ) + return true; +} + +// `Main program' equivalent, creating windows and returning main app frame +bool MyApp::OnInit() +{ + if ( !wxApp::OnInit() ) + return false; + + if ( m_lang == wxLANGUAGE_UNKNOWN ) { - lng = wxGetSingleChoiceIndex - ( - _T("Please choose language:"), - _T("Language"), - WXSIZEOF(langNames), - langNames - ); + int lng = wxGetSingleChoiceIndex + ( + _("Please choose language:"), + _("Language"), + WXSIZEOF(langNames), + langNames + ); + m_lang = lng == -1 ? wxLANGUAGE_DEFAULT : langIds[lng]; } - if ( lng != -1 ) + if ( m_lang != wxLANGUAGE_DEFAULT ) { // don't use wxLOCALE_LOAD_DEFAULT flag so that Init() doesn't return // false just because it failed to load wxstd catalog - if ( !m_locale.Init(langIds[lng], wxLOCALE_CONV_ENCODING) ) + if ( !m_locale.Init(m_lang, wxLOCALE_CONV_ENCODING) ) { - wxLogError(_T("This language is not supported by the system.")); - return false; + wxLogWarning(_("This language is not supported by the system.")); + + // continue nevertheless } } @@ -222,13 +258,15 @@ bool MyApp::OnInit() // Make a menubar wxMenu *file_menu = new wxMenu; + file_menu->Append(INTERNAT_TEST, _("&Test locale availability...\tCtrl-T")); + file_menu->AppendSeparator(); file_menu->Append(wxID_ABOUT, _("&About...")); file_menu->AppendSeparator(); file_menu->Append(wxID_EXIT, _("E&xit")); wxMenu *test_menu = new wxMenu; - test_menu->Append(INTERNAT_OPEN, _("&Open bogus file")); - test_menu->Append(INTERNAT_TEST, _("&Play a game")); + test_menu->Append(wxID_OPEN, _("&Open bogus file")); + test_menu->Append(INTERNAT_PLAY, _("&Play a game")); test_menu->AppendSeparator(); test_menu->Append(INTERNAT_TEST_1, _("&1 _() (gettext)")); test_menu->Append(INTERNAT_TEST_2, _("&2 _N() (ngettext)")); @@ -340,7 +378,34 @@ void MyFrame::OnPlay(wxCommandEvent& WXUNUSED(event)) wxMessageBox(str, _("Result"), wxOK | wxICON_INFORMATION); } -void MyFrame::OnOpen(wxCommandEvent&) +void MyFrame::OnTestLocaleAvail(wxCommandEvent& WXUNUSED(event)) +{ + static wxString s_locale; + wxString locale = wxGetTextFromUser + ( + _("Enter the locale to test"), + wxGetTextFromUserPromptStr, + s_locale, + this + ); + if ( locale.empty() ) + return; + + s_locale = locale; + const wxLanguageInfo * const info = wxLocale::FindLanguageInfo(s_locale); + if ( !info ) + { + wxLogError(_("Locale \"%s\" is unknown."), s_locale.c_str()); + return; + } + + if ( wxLocale::IsAvailable(info->Language) ) + wxLogMessage(_("Locale \"%s\" is available."), s_locale.c_str()); + else + wxLogWarning(_("Locale \"%s\" is not available."), s_locale.c_str()); +} + +void MyFrame::OnOpen(wxCommandEvent& WXUNUSED(event)) { // open a bogus file -- the error message should be also translated if // you've got wxstd.mo somewhere in the search path @@ -349,7 +414,7 @@ void MyFrame::OnOpen(wxCommandEvent&) void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event)) { - const wxChar* title = _("Testing _() (gettext)"); + const wxString title = _("Testing _() (gettext)"); wxTextEntryDialog d(this, _("Please enter text to translate"), title, wxTRANSLATE("default value")); if (d.ShowModal() == wxID_OK) @@ -364,7 +429,7 @@ void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnTest2(wxCommandEvent& WXUNUSED(event)) { - const wxChar* title = _("Testing _N() (ngettext)"); + const wxString title = _("Testing _N() (ngettext)"); wxTextEntryDialog d(this, _("Please enter range for plural forms of \"n files deleted\" phrase"), title, _T("0-10")); @@ -386,7 +451,7 @@ void MyFrame::OnTest2(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnTest3(wxCommandEvent& WXUNUSED(event)) { - const wxChar* lines[] = + const char* lines[] = { wxTRANSLATE("line 1"), wxTRANSLATE("line 2"),