Unicode compilation problems in the samples (patch from Dimitri)

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

diff --git a/samples/config/conftest.cpp b/samples/config/conftest.cpp
index a3aff05a03f0ae130514b13e17e62721fcb42849..b85f46e015aa2bdc356dc0d7f2c153581e2dda51 100644 (file)
--- a/samples/config/conftest.cpp
+++ b/samples/config/conftest.cpp
@@ -251,5 +251,5 @@ MyFrame::~MyFrame()
   pConfig->Write("/MainFrame/w", (long) w);
   pConfig->Write("/MainFrame/h", (long) h);
 
   pConfig->Write("/MainFrame/w", (long) w);
   pConfig->Write("/MainFrame/h", (long) h);
 

-  pConfig->Write("/TestValue", "");
+  pConfig->Write("/TestValue", wxT("A test value"));

 }
 }

diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp
index 35a477e82954a00105902fbd5bfeee297cc35a25..e2fd90b69a5103385ede3f02fd58e379b84d01bf 100644 (file)
--- a/samples/dialogs/dialogs.cpp
+++ b/samples/dialogs/dialogs.cpp
@@ -326,19 +326,19 @@ void MyFrame::MessageBox(wxCommandEvent& WXUNUSED(event) )
   switch ( dialog.ShowModal() )
   {
       case wxID_YES:
   switch ( dialog.ShowModal() )
   {
       case wxID_YES:

-          wxLogStatus("You pressed \"Yes\"");
+          wxLogStatus(wxT("You pressed \"Yes\""));

           break;
 
       case wxID_NO:
           break;
 
       case wxID_NO:

-          wxLogStatus("You pressed \"No\"");
+          wxLogStatus(wxT("You pressed \"No\""));

           break;
 
       case wxID_CANCEL:
           break;
 
       case wxID_CANCEL:

-          wxLogStatus("You pressed \"Cancel\"");
+          wxLogStatus(wxT("You pressed \"Cancel\""));

           break;
 
       default:
           break;
 
       default:

-          wxLogError("Unexpected wxMessageDialog return code!");
+          wxLogError(wxT("Unexpected wxMessageDialog return code!"));

   }
 }
 
   }
 }
 

diff --git a/samples/ipc/server.cpp b/samples/ipc/server.cpp
index 91a173313d326374367d14cab987aed4ea086c51..0c91c8df457136295b81d0182662f380ab759c18 100644 (file)
--- a/samples/ipc/server.cpp
+++ b/samples/ipc/server.cpp
@@ -207,7 +207,7 @@ bool MyConnection::OnExecute(const wxString& WXUNUSED(topic),
                              int WXUNUSED(size),
                              wxIPCFormat WXUNUSED(format))
 {
                              int WXUNUSED(size),
                              wxIPCFormat WXUNUSED(format))
 {

-    wxLogStatus("Execute command: %s", data);
+    wxLogStatus(wxT("Execute command: %s"), data);

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -217,7 +217,7 @@ bool MyConnection::OnPoke(const wxString& WXUNUSED(topic),
                           int WXUNUSED(size),
                           wxIPCFormat WXUNUSED(format))
 {
                           int WXUNUSED(size),
                           wxIPCFormat WXUNUSED(format))
 {

-    wxLogStatus("Poke command: %s = %s", item.c_str(), data);
+    wxLogStatus(wxT("Poke command: %s = %s"), item.c_str(), data);

     return TRUE;
 }
 
     return TRUE;
 }
 

diff --git a/samples/thread/thread.cpp b/samples/thread/thread.cpp
index 48aef6531e9f8037d0ee976b5779083b74a879a5..7ca5a653d236e56df2308ad569844c3b3373be24 100644 (file)
--- a/samples/thread/thread.cpp
+++ b/samples/thread/thread.cpp
@@ -574,16 +574,16 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) )
 
 void MyFrame::OnExecMain(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnExecMain(wxCommandEvent& WXUNUSED(event))
 {

-    wxLogMessage("The exit code from the main program is %ld",
+    wxLogMessage(wxT("The exit code from the main program is %ld"),

                  EXEC("/bin/echo \"main program\""));
 }
 
 void MyFrame::OnExecThread(wxCommandEvent& WXUNUSED(event))
 {
                  EXEC("/bin/echo \"main program\""));
 }
 
 void MyFrame::OnExecThread(wxCommandEvent& WXUNUSED(event))
 {

-    MyExecThread thread("/bin/echo \"child thread\"");
+    MyExecThread thread(wxT("/bin/echo \"child thread\""));

     thread.Run();
 
     thread.Run();
 

-    wxLogMessage("The exit code from a child thread is %ld",
+    wxLogMessage(wxT("The exit code from a child thread is %ld"),

                  (long)thread.Wait());
 }
 
                  (long)thread.Wait());
 }
 


@@ -607,7 +607,7 @@ void MyFrame::OnShowCPUs(wxCommandEvent& WXUNUSED(event))
             break;
 
         default:
             break;
 
         default:

-            msg.Printf("This system has %d CPUs", nCPUs);
+            msg.Printf(wxT("This system has %d CPUs"), nCPUs);

     }
             
     wxLogMessage(msg);
     }
             
     wxLogMessage(msg);