#include "wx/file.h"
#include "wx/log.h"
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
+#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__)
#include "mondrian.xpm"
#endif
class MyFrame: public wxFrame
{
public:
- MyFrame(wxFrame *frame, const char *title, int x, int y, int w, int h,
+ MyFrame(wxFrame *frame, const wxChar *title, int x, int y, int w, int h,
wxLocale& m_locale);
public:
// `Main program' equivalent, creating windows and returning main app frame
bool MyApp::OnInit()
{
- wxString langs[] = {_T("(System default)"),
- _T("French"),
- _T("German"),
- _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"),
- 5, langs);
+ WXSIZEOF(langs), langs);
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_ENGLISH); break;
- case 4 : m_locale.Init(wxLANGUAGE_ENGLISH_US); break;
- default:
- return FALSE;
+ 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("internat"); // 2) our private one
+ 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__
- //m_locale.AddCatalog("fileutils"); // 3) and another just for testing
+ {
+ wxLogNull noLog;
+ m_locale.AddCatalog("fileutils"); // 3) and another just for testing
+ }
#endif
// Create the main frame window
}
// My frame constructor
-MyFrame::MyFrame(wxFrame *frame, const char *title, int x, int y, int w, int h,
- wxLocale& l)
+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)),
m_locale(l)
{
void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
{
wxString localeInfo;
- localeInfo.Printf(_("Language: %s\n"
- "System locale name: %s\n"
- "Canonical locale name: %s\n"),
+ 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"))
+ wxMessageDialog(this, wxString(_("I18n sample\n(c) 1998, 1999 Vadim Zeitlin and Julian Smart"))
+ wxT("\n\n") + localeInfo,
_("About Internat"), wxOK | wxICON_INFORMATION).ShowModal();
}
return;
int num;
- sscanf(str, "%d", &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("Bad luck! try again...");
+ str = wxGetTranslation(wxT("Bad luck! try again..."));
else {
str.Empty();
// string must be split in two -- otherwise the translation won't be found
{
// open a bogus file -- the error message should be also translated if you've
// got wxstd.mo somewhere in the search path
- wxFile file("NOTEXIST.ING");
+ wxFile file(wxT("NOTEXIST.ING"));
}