merged 2.4 branch into the trunk

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-12-04 14:11:26 +00:00
parent 59a944cb63
commit 2b5f62a0b2
1057 changed files with 37805 additions and 24034 deletions

View File

@@ -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).