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
This commit is contained in:
@@ -251,5 +251,5 @@ MyFrame::~MyFrame()
|
|||||||
pConfig->Write("/MainFrame/w", (long) w);
|
pConfig->Write("/MainFrame/w", (long) w);
|
||||||
pConfig->Write("/MainFrame/h", (long) h);
|
pConfig->Write("/MainFrame/h", (long) h);
|
||||||
|
|
||||||
pConfig->Write("/TestValue", "");
|
pConfig->Write("/TestValue", wxT("A test value"));
|
||||||
}
|
}
|
||||||
|
@@ -326,19 +326,19 @@ void MyFrame::MessageBox(wxCommandEvent& WXUNUSED(event) )
|
|||||||
switch ( dialog.ShowModal() )
|
switch ( dialog.ShowModal() )
|
||||||
{
|
{
|
||||||
case wxID_YES:
|
case wxID_YES:
|
||||||
wxLogStatus("You pressed \"Yes\"");
|
wxLogStatus(wxT("You pressed \"Yes\""));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case wxID_NO:
|
case wxID_NO:
|
||||||
wxLogStatus("You pressed \"No\"");
|
wxLogStatus(wxT("You pressed \"No\""));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case wxID_CANCEL:
|
case wxID_CANCEL:
|
||||||
wxLogStatus("You pressed \"Cancel\"");
|
wxLogStatus(wxT("You pressed \"Cancel\""));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
wxLogError("Unexpected wxMessageDialog return code!");
|
wxLogError(wxT("Unexpected wxMessageDialog return code!"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -207,7 +207,7 @@ bool MyConnection::OnExecute(const wxString& WXUNUSED(topic),
|
|||||||
int WXUNUSED(size),
|
int WXUNUSED(size),
|
||||||
wxIPCFormat WXUNUSED(format))
|
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),
|
int WXUNUSED(size),
|
||||||
wxIPCFormat WXUNUSED(format))
|
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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -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\""));
|
EXEC("/bin/echo \"main program\""));
|
||||||
}
|
}
|
||||||
|
|
||||||
void MyFrame::OnExecThread(wxCommandEvent& WXUNUSED(event))
|
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;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
msg.Printf("This system has %d CPUs", nCPUs);
|
msg.Printf(wxT("This system has %d CPUs"), nCPUs);
|
||||||
}
|
}
|
||||||
|
|
||||||
wxLogMessage(msg);
|
wxLogMessage(msg);
|
||||||
|
Reference in New Issue
Block a user