don't use deprecated toolbar API

[wxWidgets.git] / samples / internat / internat.cpp

diff --git a/samples/internat/internat.cpp b/samples/internat/internat.cpp
index 1bf57ba9a401e92eab9d232cb0856cfaf1ab7293..a9d2233b4d1b83abf1b7e2a8906c191e20ed33d8 100644 (file)
--- a/samples/internat/internat.cpp
+++ b/samples/internat/internat.cpp
@@ -25,12 +25,13 @@
 #endif
 
 #ifndef WX_PRECOMP
 #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"
 #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"
 
 #if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__)
 #include "mondrian.xpm"


@@ -44,10 +45,15 @@
 class MyApp: public wxApp
 {
 public:
 class MyApp: public wxApp
 {
 public:

+    MyApp() { m_lang = wxLANGUAGE_UNKNOWN; }
+
+    virtual void OnInitCmdLine(wxCmdLineParser& parser);
+    virtual bool OnCmdLineParsed(wxCmdLineParser& parser);

     virtual bool OnInit();
 
 protected:
     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
 };
 
 // Define a new frame type


@@ -57,14 +63,16 @@ public:
     MyFrame(wxLocale& m_locale);
 
 public:
     MyFrame(wxLocale& m_locale);
 
 public:

-    void OnQuit(wxCommandEvent& event);
+    void OnTestLocaleAvail(wxCommandEvent& event);

     void OnAbout(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);

+    void OnQuit(wxCommandEvent& event);
+

     void OnPlay(wxCommandEvent& event);
     void OnOpen(wxCommandEvent& event);
     void OnTest1(wxCommandEvent& event);
     void OnTest2(wxCommandEvent& event);
     void OnTest3(wxCommandEvent& event);
     void OnPlay(wxCommandEvent& event);
     void OnOpen(wxCommandEvent& event);
     void OnTest1(wxCommandEvent& event);
     void OnTest2(wxCommandEvent& event);
     void OnTest3(wxCommandEvent& event);

-    
+

     DECLARE_EVENT_TABLE()
 
     wxLocale& m_locale;
     DECLARE_EVENT_TABLE()
 
     wxLocale& m_locale;


@@ -77,24 +85,75 @@ public:
 // ID for the menu commands
 enum
 {
 // ID for the menu commands
 enum
 {

-    INTERNAT_QUIT = 1,
-    INTERNAT_TEXT,
-    INTERNAT_TEST,
+    INTERNAT_TEST = wxID_HIGHEST + 1,
+    INTERNAT_PLAY,

     INTERNAT_TEST_1,
     INTERNAT_TEST_2,
     INTERNAT_TEST_1,
     INTERNAT_TEST_2,

-    INTERNAT_TEST_3,
-    INTERNAT_OPEN
+    INTERNAT_TEST_3
+};
+
+// 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,
+    wxLANGUAGE_ARABIC,
+    wxLANGUAGE_ARABIC_EGYPT
+#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.)"),
+    _T("Arabic"),
+    _T("Arabic (Egypt)")
+#endif
+};
+
+// the arrays must be in sync
+wxCOMPILE_TIME_ASSERT( WXSIZEOF(langNames) == WXSIZEOF(langIds),
+                       LangArraysMismatch );
+

 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------

-// wxWindows macros
+// wxWidgets macros

 // ----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 // ----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)

-    EVT_MENU(INTERNAT_QUIT, MyFrame::OnQuit)
+    EVT_MENU(INTERNAT_TEST, MyFrame::OnTestLocaleAvail)

     EVT_MENU(wxID_ABOUT, MyFrame::OnAbout)
     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)
     EVT_MENU(INTERNAT_TEST_1, MyFrame::OnTest1)
     EVT_MENU(INTERNAT_TEST_2, MyFrame::OnTest2)
     EVT_MENU(INTERNAT_TEST_3, MyFrame::OnTest3)


@@ -110,70 +169,72 @@ IMPLEMENT_APP(MyApp)
 // 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);

     }
 
     }
 

-    static const wxLanguage langIds[] =
+    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 )

     {
     {

-        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
-    };
+        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 )

     {
     {

-        // note that it makes no sense to translate these strings, they are
-        // shown before we set the locale anyhow
-        const wxString langNames[] =
+        // 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(m_lang, wxLOCALE_CONV_ENCODING) )

         {
         {

-            _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"), 
-                WXSIZEOF(langNames),
-                langNames
-              );
-    }
+            wxLogWarning(_("This language is not supported by the system."));

 
 

-    if ( lng != -1 )
-        m_locale.Init(langIds[lng]);
+            // continue nevertheless
+        }
+    }

 
 

+    // normally this wouldn't be necessary as the catalog files would be found
+    // in the default locations, but when the program is not installed the
+    // catalogs are in the build directory where we wouldn't find them by
+    // default
+    wxLocale::AddCatalogLookupPathPrefix(wxT("."));

 
     // Initialize the catalogs we'll be using
     m_locale.AddCatalog(wxT("internat"));
 
     // Initialize the catalogs we'll be using
     m_locale.AddCatalog(wxT("internat"));


@@ -197,13 +258,15 @@ bool MyApp::OnInit()
 
     // Make a menubar
     wxMenu *file_menu = new wxMenu;
 
     // 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_ABOUT, _("&About..."));
     file_menu->AppendSeparator();

-    file_menu->Append(INTERNAT_QUIT, _("E&xit"));
+    file_menu->Append(wxID_EXIT, _("E&xit"));

 
     wxMenu *test_menu = new wxMenu;
 
     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)"));
     test_menu->AppendSeparator();
     test_menu->Append(INTERNAT_TEST_1, _("&1 _() (gettext)"));
     test_menu->Append(INTERNAT_TEST_2, _("&2 _N() (ngettext)"));


@@ -215,10 +278,10 @@ bool MyApp::OnInit()
     frame->SetMenuBar(menu_bar);
 
     // Show the frame
     frame->SetMenuBar(menu_bar);
 
     // Show the frame

-    frame->Show(TRUE);
+    frame->Show(true);

     SetTopWindow(frame);
 
     SetTopWindow(frame);
 

-    return TRUE;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -228,18 +291,22 @@ bool MyApp::OnInit()
 // main frame constructor
 MyFrame::MyFrame(wxLocale& locale)
        : wxFrame(NULL,
 // main frame constructor
 MyFrame::MyFrame(wxLocale& locale)
        : wxFrame(NULL,

-                 -1,
-                 _("International wxWindows App"),
-                 wxPoint(50, 50),
-                 wxSize(350, 60)),
+                 wxID_ANY,
+                 _("International wxWidgets App")),

          m_locale(locale)
 {
          m_locale(locale)
 {

-    // Empty
+    // this demonstrates RTL layout mirroring for Arabic locales
+    wxSizer *sizer = new wxBoxSizer(wxHORIZONTAL);
+    sizer->Add(new wxStaticText(this, wxID_ANY, _("First")),
+                wxSizerFlags().Border());
+    sizer->Add(new wxStaticText(this, wxID_ANY, _("Second")),
+                wxSizerFlags().Border());
+    SetSizer(sizer);

 }
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) )
 {
 }
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) )
 {

-    Close(TRUE);
+    Close(true);

 }
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 }
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))


@@ -249,18 +316,18 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
     wxString sysname = m_locale.GetSysName();
     wxString canname = m_locale.GetCanonicalName();
 
     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() );
 
         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))
 }
 
 void MyFrame::OnPlay(wxCommandEvent& WXUNUSED(event))


@@ -311,7 +378,34 @@ void MyFrame::OnPlay(wxCommandEvent& WXUNUSED(event))
     wxMessageBox(str, _("Result"), wxOK | wxICON_INFORMATION);
 }
 
     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
 {
     // open a bogus file -- the error message should be also translated if
     // you've got wxstd.mo somewhere in the search path


@@ -320,54 +414,54 @@ void MyFrame::OnOpen(wxCommandEvent&)
 
 void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event))
 {

-    const wxChar* title = _("Testing _() (gettext)");
+    const wxString title = _("Testing _() (gettext)");

     wxTextEntryDialog d(this, _("Please enter text to translate"),
     wxTextEntryDialog d(this, _("Please enter text to translate"),

-               title, wxTRANSLATE("default value"));
+        title, wxTRANSLATE("default value"));

     if (d.ShowModal() == wxID_OK)
     {
     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);

     }
 }
 
 void MyFrame::OnTest2(wxCommandEvent& WXUNUSED(event))
 {
     }
 }
 
 void MyFrame::OnTest2(wxCommandEvent& WXUNUSED(event))
 {

-    const wxChar* title = _("Testing _N() (ngettext)");
+    const wxString title = _("Testing _N() (ngettext)");

     wxTextEntryDialog d(this,
     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)
     {
     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("file deleted", "files deleted", n) << _T("\n");
-       }
+            s << n << _T(" ") <<
+                wxPLURAL("file deleted", "files deleted", n) <<
+                _T("\n");
+        }

         wxMessageBox(s);
     }
 }
 
 void MyFrame::OnTest3(wxCommandEvent& WXUNUSED(event))
 {
         wxMessageBox(s);
     }
 }
 
 void MyFrame::OnTest3(wxCommandEvent& WXUNUSED(event))
 {

-    const wxChar* lines[] =
+    const char* 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)
     {
     };
     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);
 }
     }
     wxMessageBox(s);
 }