fixed modal dialogs after event loop change

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

diff --git a/samples/internat/internat.cpp b/samples/internat/internat.cpp
index bc13c68259800b1f69bc5187ad7973dea88111d0..cd18fb30f2685ddee78aaf67f83eb66fd2d652ca 100644 (file)
--- a/samples/internat/internat.cpp
+++ b/samples/internat/internat.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart

 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 


@@ -119,9 +119,13 @@ bool MyApp::OnInit()
         wxLANGUAGE_FRENCH,
         wxLANGUAGE_GERMAN,
         wxLANGUAGE_RUSSIAN,
         wxLANGUAGE_FRENCH,
         wxLANGUAGE_GERMAN,
         wxLANGUAGE_RUSSIAN,

+        wxLANGUAGE_BULGARIAN,
+#if wxUSE_UNICODE

         wxLANGUAGE_JAPANESE,
         wxLANGUAGE_JAPANESE,

+        wxLANGUAGE_GEORGIAN,
+#endif

         wxLANGUAGE_ENGLISH,
         wxLANGUAGE_ENGLISH,

-        wxLANGUAGE_ENGLISH_US,
+        wxLANGUAGE_ENGLISH_US

     };
 
     if ( lng == -1 )
     };
 
     if ( lng == -1 )


@@ -134,7 +138,11 @@ bool MyApp::OnInit()
             _T("French"),
             _T("German"),
             _T("Russian"),
             _T("French"),
             _T("German"),
             _T("Russian"),

+            _T("Bulgarian"),
+#if wxUSE_UNICODE

             _T("Japanese"),
             _T("Japanese"),

+            _T("Georgian"),
+#endif

             _T("English"),
             _T("English (U.S.)")
         };
             _T("English"),
             _T("English (U.S.)")
         };


@@ -226,36 +234,64 @@ 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: %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
+    (
+        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))
 {
 }
 
 void MyFrame::OnPlay(wxCommandEvent& WXUNUSED(event))
 {

-    wxString str = wxGetTextFromUser(_("Enter your number:"),
-        _("Try to guess my number!"), wxEmptyString, this);
-
-    if ( str.IsEmpty() ) return;
+    wxString str = wxGetTextFromUser
+                   (
+                    _("Enter your number:"),
+                    _("Try to guess my number!"),
+                    wxEmptyString,
+                    this
+                   );
+
+    if ( str.empty() )
+    {
+        // cancelled
+        return;
+    }

 
 

-    int num;
-    wxSscanf(str, wxT("%d"), &num);
-    if ( num == 0 )
+    long num;
+    if ( !str.ToLong(&num) || num < 0 )
+    {

         str = _("You've probably entered an invalid number.");
         str = _("You've probably entered an invalid number.");

-    else if ( num == 9 )  // this message is not translated (not in catalog)
+    }
+    else if ( num == 9 )
+    {
+        // this message is not translated (not in catalog) because we used _T()
+        // and not _() around it

         str = _T("You've found a bug in this program!");
         str = _T("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
+    }
+    else if ( num == 17 )

     {
     {

-        str.Empty();
-        // string must be split in two -- otherwise the translation won't be found
+        str.clear();
+
+        // string must be split in two -- otherwise the translation would't be
+        // found

         str << _("Congratulations! you've won. Here is the magic phrase:")
             << _("cannot create fifo `%s'");
     }
         str << _("Congratulations! you've won. Here is the magic phrase:")
             << _("cannot create fifo `%s'");
     }

+    else
+    {
+        // this is a more implicit way to write _() but note that if you use it
+        // you must ensure that the strings get extracted in the message
+        // catalog as by default xgettext won't do it (it only knows of _(),
+        // not wxGetTranslation())
+        str = wxGetTranslation(_T("Bad luck! try again..."));
+    }

 
     wxMessageBox(str, _("Result"), wxOK | wxICON_INFORMATION);
 }
 
     wxMessageBox(str, _("Result"), wxOK | wxICON_INFORMATION);
 }


@@ -266,3 +302,4 @@ void MyFrame::OnOpen(wxCommandEvent&)
     // got wxstd.mo somewhere in the search path
     wxFile file(wxT("NOTEXIST.ING"));
 }
     // got wxstd.mo somewhere in the search path
     wxFile file(wxT("NOTEXIST.ING"));
 }

+