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

18
samples/dialogs/dialogs.cpp
View File

@@ -122,7 +122,7 @@ bool MyApp::OnInit()
wxConvCurrent = &wxConvLibc;
#endif
m_canvasTextColour = wxColour("BLACK");
m_canvasTextColour = wxColour(_T("BLACK"));
m_canvasFont = *wxNORMAL_FONT;
// Create the main frame window
@@ -170,12 +170,12 @@ bool MyApp::OnInit()
file_menu->Append(DIALOGS_BUSYINFO, _T("&Busy info dialog\tCtrl-B"));
#endif // wxUSE_BUSYINFO
#if wxUSE_FINDREPLDLG
file_menu->Append(DIALOGS_FIND, _T("&Find dialog\tCtrl-F"), "", TRUE);
file_menu->Append(DIALOGS_REPLACE, _T("Find and &replace dialog\tShift-Ctrl-F"), "", TRUE);
file_menu->Append(DIALOGS_FIND, _T("&Find dialog\tCtrl-F"), _T(""), TRUE);
file_menu->Append(DIALOGS_REPLACE, _T("Find and &replace dialog\tShift-Ctrl-F"), _T(""), TRUE);
#endif // wxUSE_FINDREPLDLG
file_menu->AppendSeparator();
file_menu->Append(DIALOGS_MODAL, _T("Mo&dal dialog\tCtrl-W"));
file_menu->Append(DIALOGS_MODELESS, _T("Modeless &dialog\tCtrl-Z"), "", TRUE);
file_menu->Append(DIALOGS_MODELESS, _T("Modeless &dialog\tCtrl-Z"), _T(""), TRUE);
file_menu->AppendSeparator();
file_menu->Append(wxID_EXIT, _T("E&xit\tAlt-X"));
wxMenuBar *menu_bar = new wxMenuBar;
@@ -226,7 +226,7 @@ void MyFrame::ChooseColour(wxCommandEvent& WXUNUSED(event) )
}
wxColourDialog dialog(this, &data);
dialog.SetTitle("Choose the background colour");
dialog.SetTitle(_T("Choose the background colour"));
if (dialog.ShowModal() == wxID_OK)
{
wxColourData retData = dialog.GetColourData();
@@ -375,7 +375,7 @@ void MyFrame::PasswordEntry(wxCommandEvent& WXUNUSED(event))
{
wxString pwd = wxGetPasswordFromUser(_T("Enter password:"),
_T("Password entry dialog"),
"",
_T(""),
this);
if ( !!pwd )
{
@@ -707,7 +707,7 @@ void MyFrame::ShowBusyInfo(wxCommandEvent& WXUNUSED(event))
{
wxWindowDisabler disableAll;
wxBusyInfo info("Working, please wait...", this);
wxBusyInfo info(_T("Working, please wait..."), this);
for ( int i = 0; i < 18; i++ )
{
@@ -850,7 +850,7 @@ void MyCanvas::OnPaint(wxPaintEvent& WXUNUSED(event) )
dc.SetFont(wxGetApp().m_canvasFont);
dc.SetTextForeground(wxGetApp().m_canvasTextColour);
dc.SetBackgroundMode(wxTRANSPARENT);
dc.DrawText("wxWindows common dialogs test application", 10, 10);
dc.DrawText(_T("wxWindows common dialogs test application"), 10, 10);
}
// ----------------------------------------------------------------------------
@@ -858,7 +858,7 @@ void MyCanvas::OnPaint(wxPaintEvent& WXUNUSED(event) )
// ----------------------------------------------------------------------------
MyModelessDialog::MyModelessDialog(wxWindow *parent)
: wxDialog(parent, -1, wxString("Modeless dialog"))
: wxDialog(parent, -1, wxString(_T("Modeless dialog")))
{
wxBoxSizer *sizerTop = new wxBoxSizer(wxVERTICAL);