1. corrected problem with label updating in wxProgressDialog

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

diff --git a/samples/internat/internat.cpp b/samples/internat/internat.cpp
index 6e669da1a8ca7b2824a2b6b06ae454197c1033ba..437d7d7b61dc2189ba754001cf4d8a98bc4270f3 100644 (file)
--- a/samples/internat/internat.cpp
+++ b/samples/internat/internat.cpp
@@ -29,7 +29,7 @@
 #include "wx/file.h"
 #include "wx/log.h"
 
-#ifdef __WXGTK__
+#if defined(__WXGTK__) || defined(__WXMOTIF__)
 #include "mondrian.xpm"
 #endif
 
@@ -37,8 +37,6 @@
 class MyApp: public wxApp
 {
 public:
-  MyApp();
-
   virtual bool OnInit();
 
 protected:
@@ -56,15 +54,14 @@ public:
   void OnAbout(wxCommandEvent& event);
   void OnPlay(wxCommandEvent& event);
   void OnOpen(wxCommandEvent& event);
-  bool OnClose(void) { return TRUE; }
-  
+
   DECLARE_EVENT_TABLE()
 };
 
 // ID for the menu commands
 enum
 {
-  MINIMAL_QUIT,
+  MINIMAL_QUIT = 1,
   MINIMAL_TEXT,
   MINIMAL_ABOUT,
   MINIMAL_TEST,
@@ -81,9 +78,35 @@ END_EVENT_TABLE()
 IMPLEMENT_APP(MyApp)
 
 
-MyApp::MyApp() : m_locale("french", "fr", "C")
+// `Main program' equivalent, creating windows and returning main app frame
+bool MyApp::OnInit()
 {
-  // catalogs we'll be using:
+  // set the language to use
+  const char *language = NULL;
+  const char *langid = NULL;
+  switch ( argc )
+  {
+      default:
+          // ignore the other args, fall through
+
+      case 3:
+          language = argv[1];
+          langid = argv[2];
+          break;
+
+      case 2:
+          language = argv[1];
+          break;
+
+      case 1:
+          language = "french";
+          langid = "fr";
+  };
+
+  // there are very few systems right now which support locales other than "C"
+  m_locale.Init(language, langid, "C");
+
+  // Initialize the catalogs we'll be using
   /* not needed any more, done in wxLocale ctor
   m_locale.AddCatalog("wxstd");      // 1) for library messages
   */
@@ -91,26 +114,18 @@ MyApp::MyApp() : m_locale("french", "fr", "C")
   /* 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 */
-  m_locale.AddCatalog("fileutils");  // 3) and another just for testing
+//  m_locale.AddCatalog("fileutils");  // 3) and another just for testing
   
-}
-
-// `Main program' equivalent, creating windows and returning main app frame
-bool MyApp::OnInit(void)
-{
   // Create the main frame window
-  MyFrame *frame = new MyFrame(NULL, _("Minimal wxWindows App"), 50, 50, 150, 40);
+  MyFrame *frame = new MyFrame((wxFrame *) NULL, _("International wxWindows App"),
+                               50, 50, 350, 60);
 
   // Give it an icon
-#ifdef __WXMSW__
-  frame->SetIcon(wxIcon("mondrian"));
-#else
-  frame->SetIcon(wxIcon(mondrian_xpm));
-#endif
+  frame->SetIcon(wxICON(mondrian));
 
   // Make a menubar
   wxMenu *file_menu = new wxMenu;
-  file_menu->Append(MINIMAL_ABOUT, _("&About"));
+  file_menu->Append(MINIMAL_ABOUT, _("&About..."));
   file_menu->AppendSeparator();
   file_menu->Append(MINIMAL_QUIT, _("E&xit"));
 
@@ -143,7 +158,8 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) )
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
-  wxMessageDialog(this, _("I18n sample\n© Vadim Zeitlin & Julian Smart"),
+  wxMessageDialog(this, _("I18n sample\n"
+                          "© 1998, 1999 Vadim Zeitlin and Julian Smart"),
                   _("About Internat"), wxOK | wxICON_INFORMATION).ShowModal();
 }
 
@@ -152,18 +168,21 @@ void MyFrame::OnPlay(wxCommandEvent& WXUNUSED(event))
   wxString str = wxGetTextFromUser(_("Enter your number:"),
                                    _("Try to guess my number!"),
                                   "", this);
+  if ( str.IsEmpty() )
+      return;
+
   int num;
   sscanf(str, "%d", &num);
   if ( 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)
-    str = _("you've found a bug in this program!");
+    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("Bad luck! try again...");
   else {
     str.Empty();
     // string must be split in two -- otherwise the translation won't be found
-    str << _("congratulations! you've won. Here is the magic phrase:")
+    str << _("Congratulations! you've won. Here is the magic phrase:")
         << _("cannot create fifo `%s'");
   }
 
@@ -175,4 +194,4 @@ void MyFrame::OnOpen(wxCommandEvent&)
   // 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");
-}
\ No newline at end of file
+}