Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make some of the samples compile in Unicode mode.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18210 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2002-12-13 21:33:14 +00:00
parent c17ba76f38
commit 9f84eccdea
10 changed files with 374 additions and 372 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
samples/dialup/nettest.cpp
View File

@@ -156,7 +156,7 @@ IMPLEMENT_APP(MyApp)
bool MyApp::OnInit()
{
// Create the main application window
MyFrame *frame = new MyFrame("Dial-up wxWindows demo",
MyFrame *frame = new MyFrame(_T("Dial-up wxWindows demo"),
wxPoint(50, 50), wxSize(450, 340));
// Show it and tell the application that it's our main window
@@ -178,7 +178,7 @@ bool MyApp::OnInit()
return FALSE;
}
frame->SetStatusText(GetDialer()->IsAlwaysOnline() ? "LAN" : "No LAN", 2);
frame->SetStatusText(GetDialer()->IsAlwaysOnline() ? _T("LAN") : _T("No LAN"), 2);
return TRUE;
}
@@ -221,19 +221,19 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
// create a menu bar
wxMenu *menuFile = new wxMenu;
menuFile->Append(NetTest_Dial, "&Dial\tCtrl-D", "Dial default ISP");
menuFile->Append(NetTest_HangUp, "&HangUp\tCtrl-H", "Hang up modem");
menuFile->Append(NetTest_Dial, _T("&Dial\tCtrl-D"), _T("Dial default ISP"));
menuFile->Append(NetTest_HangUp, _T("&HangUp\tCtrl-H"), _T("Hang up modem"));
menuFile->AppendSeparator();
menuFile->Append(NetTest_EnumISP, "&Enumerate ISPs...\tCtrl-E");
menuFile->Append(NetTest_Check, "&Check connection status...\tCtrl-C");
menuFile->Append(NetTest_EnumISP, _T("&Enumerate ISPs...\tCtrl-E"));
menuFile->Append(NetTest_Check, _T("&Check connection status...\tCtrl-C"));
menuFile->AppendSeparator();
menuFile->Append(NetTest_About, "&About...\tCtrl-A", "Show about dialog");
menuFile->Append(NetTest_About, _T("&About...\tCtrl-A"), _T("Show about dialog"));
menuFile->AppendSeparator();
menuFile->Append(NetTest_Quit, "E&xit\tAlt-X", "Quit this program");
menuFile->Append(NetTest_Quit, _T("E&xit\tAlt-X"), _T("Quit this program"));
// now append the freshly created menu to the menu bar...
wxMenuBar *menuBar = new wxMenuBar;
menuBar->Append(menuFile, "&File");
menuBar->Append(menuFile, _T("&File"));
// ... and attach this menu bar to the frame
SetMenuBar(menuBar);
@@ -310,7 +310,7 @@ void MyFrame::OnEnumISPs(wxCommandEvent& WXUNUSED(event))
}
else
{
wxString msg = "Known ISPs:\n";
wxString msg = _T("Known ISPs:\n");
for ( size_t n = 0; n < nCount; n++ )
{
msg << names[n] << '\n';
@@ -335,6 +335,6 @@ void MyFrame::OnIdle(wxIdleEvent& WXUNUSED(event))
{
s_isOnline = isOnline;
SetStatusText(isOnline ? "Online" : "Offline", 1);
SetStatusText(isOnline ? _T("Online") : _T("Offline"), 1);
}
}