X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/be5a51fb592f3fa2ba38ac6cd1e488d6d806058c..740af654d1d20aaccad331e0eb73d113b5c0b02f:/samples/internat/internat.cpp?ds=sidebyside diff --git a/samples/internat/internat.cpp b/samples/internat/internat.cpp index 0a931caccd..dd1fe4bbd8 100644 --- a/samples/internat/internat.cpp +++ b/samples/internat/internat.cpp @@ -64,7 +64,7 @@ public: void OnTest1(wxCommandEvent& event); void OnTest2(wxCommandEvent& event); void OnTest3(wxCommandEvent& event); - + DECLARE_EVENT_TABLE() wxLocale& m_locale; @@ -77,8 +77,7 @@ public: // ID for the menu commands enum { - INTERNAT_QUIT = 1, - INTERNAT_TEXT, + INTERNAT_TEXT = wxID_HIGHEST + 1, INTERNAT_TEST, INTERNAT_TEST_1, INTERNAT_TEST_2, @@ -86,12 +85,59 @@ enum INTERNAT_OPEN }; +// language data +static const wxLanguage langIds[] = +{ + wxLANGUAGE_DEFAULT, + wxLANGUAGE_FRENCH, + wxLANGUAGE_GERMAN, + wxLANGUAGE_RUSSIAN, + wxLANGUAGE_BULGARIAN, + wxLANGUAGE_CZECH, + wxLANGUAGE_POLISH, + wxLANGUAGE_SWEDISH, +#if wxUSE_UNICODE || defined(__WXMOTIF__) + wxLANGUAGE_JAPANESE, +#endif +#if wxUSE_UNICODE + wxLANGUAGE_GEORGIAN, + wxLANGUAGE_ENGLISH, + wxLANGUAGE_ENGLISH_US +#endif +}; + +// note that it makes no sense to translate these strings, they are +// shown before we set the locale anyhow +const wxString langNames[] = +{ + _T("System default"), + _T("French"), + _T("German"), + _T("Russian"), + _T("Bulgarian"), + _T("Czech"), + _T("Polish"), + _T("Swedish"), +#if wxUSE_UNICODE || defined(__WXMOTIF__) + _T("Japanese"), +#endif +#if wxUSE_UNICODE + _T("Georgian"), + _T("English"), + _T("English (U.S.)") +#endif +}; + +// the arrays must be in sync +wxCOMPILE_TIME_ASSERT( WXSIZEOF(langNames) == WXSIZEOF(langIds), + LangArraysMismatch ); + // ---------------------------------------------------------------------------- // wxWidgets macros // ---------------------------------------------------------------------------- BEGIN_EVENT_TABLE(MyFrame, wxFrame) - EVT_MENU(INTERNAT_QUIT, MyFrame::OnQuit) + EVT_MENU(wxID_EXIT, MyFrame::OnQuit) EVT_MENU(wxID_ABOUT, MyFrame::OnAbout) EVT_MENU(INTERNAT_TEST, MyFrame::OnPlay) EVT_MENU(INTERNAT_OPEN, MyFrame::OnOpen) @@ -122,58 +168,35 @@ bool MyApp::OnInit() tmp.ToLong(&lng); } - static const wxLanguage langIds[] = - { - wxLANGUAGE_DEFAULT, - wxLANGUAGE_FRENCH, - wxLANGUAGE_GERMAN, - wxLANGUAGE_RUSSIAN, - wxLANGUAGE_BULGARIAN, - wxLANGUAGE_CZECH, -#if wxUSE_UNICODE - wxLANGUAGE_JAPANESE, - wxLANGUAGE_GEORGIAN, -#endif - wxLANGUAGE_ENGLISH, - wxLANGUAGE_ENGLISH_US - }; - if ( lng == -1 ) { - // note that it makes no sense to translate these strings, they are - // shown before we set the locale anyhow - const wxString langNames[] = - { - _T("System default"), - _T("French"), - _T("German"), - _T("Russian"), - _T("Bulgarian"), - _T("Czech"), -#if wxUSE_UNICODE - _T("Japanese"), - _T("Georgian"), -#endif - _T("English"), - _T("English (U.S.)") - }; - - // the arrays should be in sync - wxCOMPILE_TIME_ASSERT( WXSIZEOF(langNames) == WXSIZEOF(langIds), - LangArraysMismatch ); - lng = wxGetSingleChoiceIndex ( _T("Please choose language:"), - _T("Language"), + _T("Language"), WXSIZEOF(langNames), langNames ); } if ( lng != -1 ) - m_locale.Init(langIds[lng]); + { + // 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) ) + { + wxLogError(_T("This language is not supported by the system.")); + return false; + } + } + // normally this wouldn't be necessary as the catalog files would be found + // in the default locations, but under Windows then the program is not + // installed the catalogs are in the parent directory (because the binary + // is in a subdirectory of samples/internat) where we wouldn't find them by + // default + wxLocale::AddCatalogLookupPathPrefix(wxT(".")); + wxLocale::AddCatalogLookupPathPrefix(wxT("..")); // Initialize the catalogs we'll be using m_locale.AddCatalog(wxT("internat")); @@ -199,7 +222,7 @@ bool MyApp::OnInit() wxMenu *file_menu = new wxMenu; file_menu->Append(wxID_ABOUT, _("&About...")); file_menu->AppendSeparator(); - file_menu->Append(INTERNAT_QUIT, _("E&xit")); + file_menu->Append(wxID_EXIT, _("E&xit")); wxMenu *test_menu = new wxMenu; test_menu->Append(INTERNAT_OPEN, _("&Open bogus file")); @@ -215,10 +238,10 @@ bool MyApp::OnInit() frame->SetMenuBar(menu_bar); // Show the frame - frame->Show(TRUE); + frame->Show(true); SetTopWindow(frame); - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -228,10 +251,8 @@ bool MyApp::OnInit() // main frame constructor MyFrame::MyFrame(wxLocale& locale) : wxFrame(NULL, - -1, - _("International wxWidgets App"), - wxPoint(50, 50), - wxSize(350, 60)), + wxID_ANY, + _("International wxWidgets App")), m_locale(locale) { // Empty @@ -239,7 +260,7 @@ MyFrame::MyFrame(wxLocale& locale) void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) ) { - Close(TRUE); + Close(true); } void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) @@ -249,18 +270,18 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) wxString sysname = m_locale.GetSysName(); wxString canname = m_locale.GetCanonicalName(); - localeInfo.Printf(_("Language: %s\nSystem locale name: %s\nCanonical locale name: %s\n"), + localeInfo.Printf(_("Language: %s\nSystem locale name:\n%s\nCanonical locale name: %s\n"), locale.c_str(), sysname.c_str(), canname.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 dlg( + this, + wxString(_("I18n sample\n(c) 1998, 1999 Vadim Zeitlin and Julian Smart")) + + wxT("\n\n") + + localeInfo, + _("About Internat"), + wxOK | wxICON_INFORMATION + ); + dlg.ShowModal(); } void MyFrame::OnPlay(wxCommandEvent& WXUNUSED(event)) @@ -322,14 +343,14 @@ void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event)) { const wxChar* title = _("Testing _() (gettext)"); wxTextEntryDialog d(this, _("Please enter text to translate"), - title, wxTRANSLATE("default value")); + title, wxTRANSLATE("default value")); if (d.ShowModal() == wxID_OK) { - wxString v = d.GetValue(); - wxString s(title); - s << _T("\n") << v << _T(" -> ") - << wxGetTranslation(v.c_str()) << _T("\n"); - wxMessageBox(s); + wxString v = d.GetValue(); + wxString s(title); + s << _T("\n") << v << _T(" -> ") + << wxGetTranslation(v.c_str()) << _T("\n"); + wxMessageBox(s); } } @@ -337,20 +358,20 @@ void MyFrame::OnTest2(wxCommandEvent& WXUNUSED(event)) { const wxChar* title = _("Testing _N() (ngettext)"); wxTextEntryDialog d(this, - _("Please enter range for plural forms of \"n files deleted\" phrase"), - title, _T("0-10")); + _("Please enter range for plural forms of \"n files deleted\" phrase"), + title, _T("0-10")); if (d.ShowModal() == wxID_OK) { - int first, last; - wxSscanf(d.GetValue(), _T("%d-%d"), &first, &last); - wxString s(title); - s << _T("\n"); - for (int n = first; n <= last; ++n) + int first, last; + wxSscanf(d.GetValue(), _T("%d-%d"), &first, &last); + wxString s(title); + s << _T("\n"); + for (int n = first; n <= last; ++n) { - s << n << _T(" ") << - wxGetTranslation(_T("file deleted"), _T("files deleted"), n) << + s << n << _T(" ") << + wxPLURAL("file deleted", "files deleted", n) << _T("\n"); - } + } wxMessageBox(s); } } @@ -359,15 +380,15 @@ void MyFrame::OnTest3(wxCommandEvent& WXUNUSED(event)) { const wxChar* lines[] = { - wxTRANSLATE("line 1"), - wxTRANSLATE("line 2"), - wxTRANSLATE("line 3"), + wxTRANSLATE("line 1"), + wxTRANSLATE("line 2"), + wxTRANSLATE("line 3"), }; wxString s(_("Testing wxTRANSLATE() (gettext_noop)")); s << _T("\n"); for (size_t i = 0; i < WXSIZEOF(lines); ++i) { - s << lines[i] << _T(" -> ") << wxGetTranslation(lines[i]) << _T("\n"); + s << lines[i] << _T(" -> ") << wxGetTranslation(lines[i]) << _T("\n"); } wxMessageBox(s); }