fix for bug in wxEditableListBox in connection with new wxListCtrl

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

diff --git a/samples/internat/internat.cpp b/samples/internat/internat.cpp
index ab08456a6b489cbf52e5bf7519ccc8aa4ab4aaba..3d313fece4ac597d1cc3f0bfb060a48e423d2677 100644 (file)
--- a/samples/internat/internat.cpp
+++ b/samples/internat/internat.cpp
@@ -29,7 +29,7 @@
 #include "wx/file.h"
 #include "wx/log.h"
 
-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
 #include "mondrian.xpm"
 #endif
 
@@ -84,14 +84,19 @@ IMPLEMENT_APP(MyApp)
 // `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)
@@ -99,13 +104,12 @@ bool MyApp::OnInit()
       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
@@ -115,7 +119,10 @@ bool MyApp::OnInit()
      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