From a574cf21c5a7774e7263582ee73d0b697adc2060 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sat, 9 Nov 2002 23:18:16 +0000 Subject: [PATCH] Unicode fixes to xrcdemo git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/samples/xrc/custclas.cpp | 2 +- contrib/samples/xrc/derivdlg.cpp | 2 +- contrib/samples/xrc/myframe.cpp | 24 ++++++++++++------------ contrib/samples/xrc/xrcdemo.cpp | 22 +++++++++++----------- samples/xrc/custclas.cpp | 2 +- samples/xrc/derivdlg.cpp | 2 +- samples/xrc/myframe.cpp | 24 ++++++++++++------------ samples/xrc/xrcdemo.cpp | 22 +++++++++++----------- 8 files changed, 50 insertions(+), 50 deletions(-) diff --git a/contrib/samples/xrc/custclas.cpp b/contrib/samples/xrc/custclas.cpp index 020a14e4b5..ba30c5f7f7 100644 --- a/contrib/samples/xrc/custclas.cpp +++ b/contrib/samples/xrc/custclas.cpp @@ -156,7 +156,7 @@ void MyResizableListCtrl::SetColumnWidths() // This is just a debug message in case you want to watch the // events scroll by as you resize. - wxLogDebug( "Successfully set column widths" ); + wxLogDebug( wxT("Successfully set column widths") ); } diff --git a/contrib/samples/xrc/derivdlg.cpp b/contrib/samples/xrc/derivdlg.cpp index a9a719c49d..437615d60b 100644 --- a/contrib/samples/xrc/derivdlg.cpp +++ b/contrib/samples/xrc/derivdlg.cpp @@ -61,7 +61,7 @@ END_EVENT_TABLE() // Constructor (Notice how small and easy it is) PreferencesDialog::PreferencesDialog(wxWindow* parent) { - wxXmlResource::Get()->LoadDialog(this, parent, "derived_dialog"); + wxXmlResource::Get()->LoadDialog(this, parent, wxT("derived_dialog")); } // Destructor. (Empty, as I don't need anything special done when destructing). diff --git a/contrib/samples/xrc/myframe.cpp b/contrib/samples/xrc/myframe.cpp index 2d03b22e44..594d8769e1 100644 --- a/contrib/samples/xrc/myframe.cpp +++ b/contrib/samples/xrc/myframe.cpp @@ -109,18 +109,18 @@ MyFrame::MyFrame(wxWindow* parent) // since this frame will always be the top window, and thus parentless. // However, the current approach has source code that can be recycled // for other frames that aren't the top level window.] - wxXmlResource::Get()->LoadFrame(this, parent, "main_frame"); + wxXmlResource::Get()->LoadFrame(this, parent, wxT("main_frame")); // Set the icon for the frame. SetIcon(wxICON(appicon)); // Load the menubar from XRC and set this frame's menubar to it. - SetMenuBar(wxXmlResource::Get()->LoadMenuBar("main_menu")); + SetMenuBar(wxXmlResource::Get()->LoadMenuBar(wxT("main_menu"))); // Load the toolbar from XRC and set this frame's toolbar to it. // NOTE: For toolbars you currently should do it exactly like this. // With toolbars, you currently can't create one, and set it later. It // needs to be all in one step. - SetToolBar(wxXmlResource::Get()->LoadToolBar(this, "main_toolbar")); + SetToolBar(wxXmlResource::Get()->LoadToolBar(this, wxT("main_toolbar"))); // Give the frame a optional statusbar. The '1' just means one field. // A gripsizer will automatically get put on into the corner, if that @@ -146,7 +146,7 @@ void MyFrame::OnNonDerivedDialogToolOrMenuCommand(wxCommandEvent& WXUNUSED(event wxDialog dlg; // "non_derived_dialog" is the name of the wxDialog XRC node that should // be loaded. - wxXmlResource::Get()->LoadDialog(&dlg, this, "non_derived_dialog"); + wxXmlResource::Get()->LoadDialog(&dlg, this, wxT("non_derived_dialog")); dlg.ShowModal(); } @@ -166,7 +166,7 @@ void MyFrame::OnDerivedDialogToolOrMenuCommand(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnControlsToolOrMenuCommand(wxCommandEvent& WXUNUSED(event)) { wxDialog dlg; - wxXmlResource::Get()->LoadDialog(&dlg, this, "controls_dialog"); + wxXmlResource::Get()->LoadDialog(&dlg, this, wxT("controls_dialog")); #if wxUSE_LISTCTRL // There is no data in the listctrl. This will add some columns @@ -211,7 +211,7 @@ void MyFrame::OnControlsToolOrMenuCommand(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnUncenteredToolOrMenuCommand(wxCommandEvent& WXUNUSED(event)) { wxDialog dlg; - wxXmlResource::Get()->LoadDialog(&dlg, this, "uncentered_dialog"); + wxXmlResource::Get()->LoadDialog(&dlg, this, wxT("uncentered_dialog")); dlg.ShowModal(); } @@ -219,7 +219,7 @@ void MyFrame::OnUncenteredToolOrMenuCommand(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnCustomClassToolOrMenuCommand(wxCommandEvent& WXUNUSED(event)) { wxDialog dlg; - wxXmlResource::Get()->LoadDialog(&dlg, this, "custom_class_dialog"); + wxXmlResource::Get()->LoadDialog(&dlg, this, wxT("custom_class_dialog")); // Make an instance of our new custom class. MyResizableListCtrl* a_myResizableListCtrl = new MyResizableListCtrl(&dlg, @@ -231,7 +231,7 @@ void MyFrame::OnCustomClassToolOrMenuCommand(wxCommandEvent& WXUNUSED(event)) // "custom_control_placeholder" is the name of the "unknown" tag in the // custctrl.xrc XRC file. - wxXmlResource::Get()->AttachUnknownControl("custom_control_placeholder", + wxXmlResource::Get()->AttachUnknownControl(wxT("custom_control_placeholder"), a_myResizableListCtrl); dlg.ShowModal(); } @@ -240,7 +240,7 @@ void MyFrame::OnCustomClassToolOrMenuCommand(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnPlatformPropertyToolOrMenuCommand(wxCommandEvent& WXUNUSED(event)) { wxDialog dlg; - wxXmlResource::Get()->LoadDialog(&dlg, this, "platform_property_dialog"); + wxXmlResource::Get()->LoadDialog(&dlg, this, wxT("platform_property_dialog")); dlg.ShowModal(); } @@ -248,7 +248,7 @@ void MyFrame::OnPlatformPropertyToolOrMenuCommand(wxCommandEvent& WXUNUSED(event void MyFrame::OnArtProviderToolOrMenuCommand(wxCommandEvent& WXUNUSED(event)) { wxDialog dlg; - wxXmlResource::Get()->LoadDialog(&dlg, this, "art_provider_dialog"); + wxXmlResource::Get()->LoadDialog(&dlg, this, wxT("art_provider_dialog")); dlg.ShowModal(); } @@ -256,7 +256,7 @@ void MyFrame::OnArtProviderToolOrMenuCommand(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnVariableExpansionToolOrMenuCommand(wxCommandEvent& WXUNUSED(event)) { wxDialog dlg; - wxXmlResource::Get()->LoadDialog(&dlg, this, "variable_expansion_dialog"); + wxXmlResource::Get()->LoadDialog(&dlg, this, wxT("variable_expansion_dialog")); dlg.ShowModal(); } @@ -267,5 +267,5 @@ void MyFrame::OnAboutToolOrMenuCommand(wxCommandEvent& WXUNUSED(event)) msg.Printf( _T("This is the about dialog of XML resources demo.\n") _T("Welcome to %s"), wxVERSION_STRING); - wxMessageBox(msg, "About XML resources demo", wxOK | wxICON_INFORMATION, this); + wxMessageBox(msg, _("About XML resources demo"), wxOK | wxICON_INFORMATION, this); } diff --git a/contrib/samples/xrc/xrcdemo.cpp b/contrib/samples/xrc/xrcdemo.cpp index f7d755352c..c904f52e28 100644 --- a/contrib/samples/xrc/xrcdemo.cpp +++ b/contrib/samples/xrc/xrcdemo.cpp @@ -88,27 +88,27 @@ bool MyApp::OnInit() // into one giant XRC file if you wanted, but then they become more // diffcult to manage, and harder to reuse in later projects. // The menubar - wxXmlResource::Get()->Load("rc/menu.xrc"); + wxXmlResource::Get()->Load(wxT("rc/menu.xrc")); // The toolbar - wxXmlResource::Get()->Load("rc/toolbar.xrc"); + wxXmlResource::Get()->Load(wxT("rc/toolbar.xrc")); // Non-derived dialog example - wxXmlResource::Get()->Load("rc/basicdlg.xrc"); + wxXmlResource::Get()->Load(wxT("rc/basicdlg.xrc")); // Derived dialog example - wxXmlResource::Get()->Load("rc/derivdlg.xrc"); + wxXmlResource::Get()->Load(wxT("rc/derivdlg.xrc")); // Controls property example - wxXmlResource::Get()->Load("rc/controls.xrc"); + wxXmlResource::Get()->Load(wxT("rc/controls.xrc")); // Frame example - wxXmlResource::Get()->Load("rc/frame.xrc"); + wxXmlResource::Get()->Load(wxT("rc/frame.xrc")); // Uncentered example - wxXmlResource::Get()->Load("rc/uncenter.xrc"); + wxXmlResource::Get()->Load(wxT("rc/uncenter.xrc")); // Custom class example - wxXmlResource::Get()->Load("rc/custclas.xrc"); + wxXmlResource::Get()->Load(wxT("rc/custclas.xrc")); // wxArtProvider example - wxXmlResource::Get()->Load("rc/artprov.xrc"); + wxXmlResource::Get()->Load(wxT("rc/artprov.xrc")); // Platform property example - wxXmlResource::Get()->Load("rc/platform.xrc"); + wxXmlResource::Get()->Load(wxT("rc/platform.xrc")); // Variable expansion example - wxXmlResource::Get()->Load("rc/variable.xrc"); + wxXmlResource::Get()->Load(wxT("rc/variable.xrc")); // Make an instance of your derived frame. Passing NULL (the default value // of MyFrame's constructor is NULL) as the frame doesn't have a frame diff --git a/samples/xrc/custclas.cpp b/samples/xrc/custclas.cpp index 020a14e4b5..ba30c5f7f7 100644 --- a/samples/xrc/custclas.cpp +++ b/samples/xrc/custclas.cpp @@ -156,7 +156,7 @@ void MyResizableListCtrl::SetColumnWidths() // This is just a debug message in case you want to watch the // events scroll by as you resize. - wxLogDebug( "Successfully set column widths" ); + wxLogDebug( wxT("Successfully set column widths") ); } diff --git a/samples/xrc/derivdlg.cpp b/samples/xrc/derivdlg.cpp index a9a719c49d..437615d60b 100644 --- a/samples/xrc/derivdlg.cpp +++ b/samples/xrc/derivdlg.cpp @@ -61,7 +61,7 @@ END_EVENT_TABLE() // Constructor (Notice how small and easy it is) PreferencesDialog::PreferencesDialog(wxWindow* parent) { - wxXmlResource::Get()->LoadDialog(this, parent, "derived_dialog"); + wxXmlResource::Get()->LoadDialog(this, parent, wxT("derived_dialog")); } // Destructor. (Empty, as I don't need anything special done when destructing). diff --git a/samples/xrc/myframe.cpp b/samples/xrc/myframe.cpp index 2d03b22e44..594d8769e1 100644 --- a/samples/xrc/myframe.cpp +++ b/samples/xrc/myframe.cpp @@ -109,18 +109,18 @@ MyFrame::MyFrame(wxWindow* parent) // since this frame will always be the top window, and thus parentless. // However, the current approach has source code that can be recycled // for other frames that aren't the top level window.] - wxXmlResource::Get()->LoadFrame(this, parent, "main_frame"); + wxXmlResource::Get()->LoadFrame(this, parent, wxT("main_frame")); // Set the icon for the frame. SetIcon(wxICON(appicon)); // Load the menubar from XRC and set this frame's menubar to it. - SetMenuBar(wxXmlResource::Get()->LoadMenuBar("main_menu")); + SetMenuBar(wxXmlResource::Get()->LoadMenuBar(wxT("main_menu"))); // Load the toolbar from XRC and set this frame's toolbar to it. // NOTE: For toolbars you currently should do it exactly like this. // With toolbars, you currently can't create one, and set it later. It // needs to be all in one step. - SetToolBar(wxXmlResource::Get()->LoadToolBar(this, "main_toolbar")); + SetToolBar(wxXmlResource::Get()->LoadToolBar(this, wxT("main_toolbar"))); // Give the frame a optional statusbar. The '1' just means one field. // A gripsizer will automatically get put on into the corner, if that @@ -146,7 +146,7 @@ void MyFrame::OnNonDerivedDialogToolOrMenuCommand(wxCommandEvent& WXUNUSED(event wxDialog dlg; // "non_derived_dialog" is the name of the wxDialog XRC node that should // be loaded. - wxXmlResource::Get()->LoadDialog(&dlg, this, "non_derived_dialog"); + wxXmlResource::Get()->LoadDialog(&dlg, this, wxT("non_derived_dialog")); dlg.ShowModal(); } @@ -166,7 +166,7 @@ void MyFrame::OnDerivedDialogToolOrMenuCommand(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnControlsToolOrMenuCommand(wxCommandEvent& WXUNUSED(event)) { wxDialog dlg; - wxXmlResource::Get()->LoadDialog(&dlg, this, "controls_dialog"); + wxXmlResource::Get()->LoadDialog(&dlg, this, wxT("controls_dialog")); #if wxUSE_LISTCTRL // There is no data in the listctrl. This will add some columns @@ -211,7 +211,7 @@ void MyFrame::OnControlsToolOrMenuCommand(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnUncenteredToolOrMenuCommand(wxCommandEvent& WXUNUSED(event)) { wxDialog dlg; - wxXmlResource::Get()->LoadDialog(&dlg, this, "uncentered_dialog"); + wxXmlResource::Get()->LoadDialog(&dlg, this, wxT("uncentered_dialog")); dlg.ShowModal(); } @@ -219,7 +219,7 @@ void MyFrame::OnUncenteredToolOrMenuCommand(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnCustomClassToolOrMenuCommand(wxCommandEvent& WXUNUSED(event)) { wxDialog dlg; - wxXmlResource::Get()->LoadDialog(&dlg, this, "custom_class_dialog"); + wxXmlResource::Get()->LoadDialog(&dlg, this, wxT("custom_class_dialog")); // Make an instance of our new custom class. MyResizableListCtrl* a_myResizableListCtrl = new MyResizableListCtrl(&dlg, @@ -231,7 +231,7 @@ void MyFrame::OnCustomClassToolOrMenuCommand(wxCommandEvent& WXUNUSED(event)) // "custom_control_placeholder" is the name of the "unknown" tag in the // custctrl.xrc XRC file. - wxXmlResource::Get()->AttachUnknownControl("custom_control_placeholder", + wxXmlResource::Get()->AttachUnknownControl(wxT("custom_control_placeholder"), a_myResizableListCtrl); dlg.ShowModal(); } @@ -240,7 +240,7 @@ void MyFrame::OnCustomClassToolOrMenuCommand(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnPlatformPropertyToolOrMenuCommand(wxCommandEvent& WXUNUSED(event)) { wxDialog dlg; - wxXmlResource::Get()->LoadDialog(&dlg, this, "platform_property_dialog"); + wxXmlResource::Get()->LoadDialog(&dlg, this, wxT("platform_property_dialog")); dlg.ShowModal(); } @@ -248,7 +248,7 @@ void MyFrame::OnPlatformPropertyToolOrMenuCommand(wxCommandEvent& WXUNUSED(event void MyFrame::OnArtProviderToolOrMenuCommand(wxCommandEvent& WXUNUSED(event)) { wxDialog dlg; - wxXmlResource::Get()->LoadDialog(&dlg, this, "art_provider_dialog"); + wxXmlResource::Get()->LoadDialog(&dlg, this, wxT("art_provider_dialog")); dlg.ShowModal(); } @@ -256,7 +256,7 @@ void MyFrame::OnArtProviderToolOrMenuCommand(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnVariableExpansionToolOrMenuCommand(wxCommandEvent& WXUNUSED(event)) { wxDialog dlg; - wxXmlResource::Get()->LoadDialog(&dlg, this, "variable_expansion_dialog"); + wxXmlResource::Get()->LoadDialog(&dlg, this, wxT("variable_expansion_dialog")); dlg.ShowModal(); } @@ -267,5 +267,5 @@ void MyFrame::OnAboutToolOrMenuCommand(wxCommandEvent& WXUNUSED(event)) msg.Printf( _T("This is the about dialog of XML resources demo.\n") _T("Welcome to %s"), wxVERSION_STRING); - wxMessageBox(msg, "About XML resources demo", wxOK | wxICON_INFORMATION, this); + wxMessageBox(msg, _("About XML resources demo"), wxOK | wxICON_INFORMATION, this); } diff --git a/samples/xrc/xrcdemo.cpp b/samples/xrc/xrcdemo.cpp index f7d755352c..c904f52e28 100644 --- a/samples/xrc/xrcdemo.cpp +++ b/samples/xrc/xrcdemo.cpp @@ -88,27 +88,27 @@ bool MyApp::OnInit() // into one giant XRC file if you wanted, but then they become more // diffcult to manage, and harder to reuse in later projects. // The menubar - wxXmlResource::Get()->Load("rc/menu.xrc"); + wxXmlResource::Get()->Load(wxT("rc/menu.xrc")); // The toolbar - wxXmlResource::Get()->Load("rc/toolbar.xrc"); + wxXmlResource::Get()->Load(wxT("rc/toolbar.xrc")); // Non-derived dialog example - wxXmlResource::Get()->Load("rc/basicdlg.xrc"); + wxXmlResource::Get()->Load(wxT("rc/basicdlg.xrc")); // Derived dialog example - wxXmlResource::Get()->Load("rc/derivdlg.xrc"); + wxXmlResource::Get()->Load(wxT("rc/derivdlg.xrc")); // Controls property example - wxXmlResource::Get()->Load("rc/controls.xrc"); + wxXmlResource::Get()->Load(wxT("rc/controls.xrc")); // Frame example - wxXmlResource::Get()->Load("rc/frame.xrc"); + wxXmlResource::Get()->Load(wxT("rc/frame.xrc")); // Uncentered example - wxXmlResource::Get()->Load("rc/uncenter.xrc"); + wxXmlResource::Get()->Load(wxT("rc/uncenter.xrc")); // Custom class example - wxXmlResource::Get()->Load("rc/custclas.xrc"); + wxXmlResource::Get()->Load(wxT("rc/custclas.xrc")); // wxArtProvider example - wxXmlResource::Get()->Load("rc/artprov.xrc"); + wxXmlResource::Get()->Load(wxT("rc/artprov.xrc")); // Platform property example - wxXmlResource::Get()->Load("rc/platform.xrc"); + wxXmlResource::Get()->Load(wxT("rc/platform.xrc")); // Variable expansion example - wxXmlResource::Get()->Load("rc/variable.xrc"); + wxXmlResource::Get()->Load(wxT("rc/variable.xrc")); // Make an instance of your derived frame. Passing NULL (the default value // of MyFrame's constructor is NULL) as the frame doesn't have a frame