Changes required after wxUniv merge wxListBox::Number() changed to wxListBox::GetCount()

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

diff --git a/samples/internat/internat.cpp b/samples/internat/internat.cpp
index 265dd57e678767a068a317f4ec1327b1dead2e97..50c84b9dfe6d696f2067cfa00c3ae805ad5c959b 100644 (file)
--- a/samples/internat/internat.cpp
+++ b/samples/internat/internat.cpp
@@ -29,12 +29,14 @@
 #include "wx/file.h"
 #include "wx/log.h"
 
 #include "wx/file.h"
 #include "wx/log.h"
 

+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
+#include "mondrian.xpm"
+#endif
+

 // Define a new application type
 class MyApp: public wxApp
 {
 public:
 // Define a new application type
 class MyApp: public wxApp
 {
 public:

-  MyApp();
-

   virtual bool OnInit();
 
 protected:
   virtual bool OnInit();
 
 protected:


@@ -45,22 +47,24 @@ protected:
 class MyFrame: public wxFrame
 { 
 public:
 class MyFrame: public wxFrame
 { 
 public:

-  MyFrame(wxFrame *frame, const char *title, int x, int y, int w, int h);
+  MyFrame(wxFrame *frame, const char *title, int x, int y, int w, int h,
+          wxLocale& m_locale);

 
 public:
   void OnQuit(wxCommandEvent& event);
   void OnAbout(wxCommandEvent& event);
   void OnPlay(wxCommandEvent& event);
   void OnOpen(wxCommandEvent& event);
 
 public:
   void OnQuit(wxCommandEvent& event);
   void OnAbout(wxCommandEvent& event);
   void OnPlay(wxCommandEvent& event);
   void OnOpen(wxCommandEvent& event);

-  bool OnClose(void) { return TRUE; }
-  
+

   DECLARE_EVENT_TABLE()
   DECLARE_EVENT_TABLE()

+  
+  wxLocale& m_locale;

 };
 
 // ID for the menu commands
 enum
 {
 };
 
 // ID for the menu commands
 enum
 {

-  MINIMAL_QUIT,
+  MINIMAL_QUIT = 1,

   MINIMAL_TEXT,
   MINIMAL_ABOUT,
   MINIMAL_TEST,
   MINIMAL_TEXT,
   MINIMAL_ABOUT,
   MINIMAL_TEST,


@@ -77,9 +81,32 @@ END_EVENT_TABLE()
 IMPLEMENT_APP(MyApp)
 
 
 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:
+  wxString langs[] = {_T("(System default)"),
+                      _T("French"),
+                      _T("German"),
+                      _T("English"),
+                      _T("English (U.S.)")};
+  SetExitOnFrameDelete(FALSE);
+  int lng = wxGetSingleChoiceIndex(_T("Please choose language:"), _T("Language"), 
+                                   5, 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;
+  }
+
+
+  // Initialize the catalogs we'll be using

   /* not needed any more, done in wxLocale ctor
   m_locale.AddCatalog("wxstd");      // 1) for library messages
   */
   /* not needed any more, done in wxLocale ctor
   m_locale.AddCatalog("wxstd");      // 1) for library messages
   */


@@ -87,27 +114,20 @@ 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 */
   /* 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
+#ifdef __LINUX__
+  //m_locale.AddCatalog("fileutils");  // 3) and another just for testing
+#endif

   
   

-}
-
-// `Main program' equivalent, creating windows and returning main app frame
-bool MyApp::OnInit(void)
-{

   // Create the main frame window
   // 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, m_locale);

 
   // Give it an icon
 
   // Give it an icon

-#ifdef __WXMSW__
-  frame->SetIcon(wxIcon("mondrian"));
-#endif
-#ifdef __X__
-  frame->SetIcon(wxIcon("aiai.xbm"));
-#endif
+  frame->SetIcon(wxICON(mondrian));

 
   // Make a menubar
   wxMenu *file_menu = new wxMenu;
 
   // 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"));
 
   file_menu->AppendSeparator();
   file_menu->Append(MINIMAL_QUIT, _("E&xit"));
 


@@ -128,8 +148,10 @@ bool MyApp::OnInit(void)
 }
 
 // My frame constructor
 }
 
 // My frame constructor

-MyFrame::MyFrame(wxFrame *frame, const char *title, int x, int y, int w, int h)
-       : wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h))
+MyFrame::MyFrame(wxFrame *frame, const char *title, int x, int y, int w, int h, 
+                 wxLocale& l)
+       : wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h)),
+         m_locale(l)

 {
 }
 
 {
 }
 


@@ -140,7 +162,17 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) )
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {

-  wxMessageDialog(this, _("I18n sample\n© Vadim Zeitlin & Julian Smart"),
+  wxString localeInfo;
+  localeInfo.Printf(_("Language: %s\n"
+                      "System locale name: %s\n"
+                      "Canonical 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"))
+                          + wxT("\n\n") + localeInfo,

                   _("About Internat"), wxOK | wxICON_INFORMATION).ShowModal();
 }
 
                   _("About Internat"), wxOK | wxICON_INFORMATION).ShowModal();
 }
 


@@ -149,18 +181,21 @@ void MyFrame::OnPlay(wxCommandEvent& WXUNUSED(event))
   wxString str = wxGetTextFromUser(_("Enter your number:"),
                                    _("Try to guess my number!"),
                                   "", this);
   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 )
   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)
   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 _()
   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
   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'");
   }
 
         << _("cannot create fifo `%s'");
   }
 


@@ -172,4 +207,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");
   // 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
+}