post wxUniv merge fix

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11127 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/internat/internat.cpp b/samples/internat/internat.cpp
index 3cc7c2dfc47cf15e240dfa3eb3dccf22db0caa57..3d313fece4ac597d1cc3f0bfb060a48e423d2677 100644 (file)
--- a/samples/internat/internat.cpp
+++ b/samples/internat/internat.cpp
@@ -84,7 +84,7 @@ IMPLEMENT_APP(MyApp)
 // `Main program' equivalent, creating windows and returning main app frame
 bool MyApp::OnInit()
 {
 // `Main program' equivalent, creating windows and returning main app frame
 bool MyApp::OnInit()
 {

-  const wxChar * const langs[] =
+  const wxString langs[] =

   {
       _T("(System default)"),
       _T("French"),
   {
       _T("(System default)"),
       _T("French"),


@@ -96,7 +96,7 @@ bool MyApp::OnInit()
 
   SetExitOnFrameDelete(FALSE);
   int lng = wxGetSingleChoiceIndex(_T("Please choose language:"), _T("Language"), 
 
   SetExitOnFrameDelete(FALSE);
   int lng = wxGetSingleChoiceIndex(_T("Please choose language:"), _T("Language"), 

-                                   WXSIZEOF(langs), (char **)langs);
+                                   WXSIZEOF(langs), langs);

   SetExitOnFrameDelete(TRUE);
 
   switch (lng)
   SetExitOnFrameDelete(TRUE);
 
   switch (lng)