From b5d6954b87d910969226ffade9714db7429211f3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Fri, 23 Nov 2001 19:38:05 +0000 Subject: [PATCH] cosmetic change: XML resource -> XRC resource git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12624 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/src/xrc/xh_bmp.cpp | 2 +- contrib/src/xrc/xh_bmpbt.cpp | 2 +- contrib/src/xrc/xh_bttn.cpp | 2 +- contrib/src/xrc/xh_cald.cpp | 2 +- contrib/src/xrc/xh_chckb.cpp | 2 +- contrib/src/xrc/xh_chckl.cpp | 2 +- contrib/src/xrc/xh_choic.cpp | 2 +- contrib/src/xrc/xh_combo.cpp | 2 +- contrib/src/xrc/xh_dlg.cpp | 4 ++-- contrib/src/xrc/xh_frame.cpp | 4 ++-- contrib/src/xrc/xh_gauge.cpp | 2 +- contrib/src/xrc/xh_html.cpp | 2 +- contrib/src/xrc/xh_listb.cpp | 2 +- contrib/src/xrc/xh_listc.cpp | 2 +- contrib/src/xrc/xh_menu.cpp | 2 +- contrib/src/xrc/xh_notbk.cpp | 2 +- contrib/src/xrc/xh_panel.cpp | 2 +- contrib/src/xrc/xh_radbt.cpp | 2 +- contrib/src/xrc/xh_radbx.cpp | 2 +- contrib/src/xrc/xh_scrol.cpp | 2 +- contrib/src/xrc/xh_sizer.cpp | 4 ++-- contrib/src/xrc/xh_slidr.cpp | 2 +- contrib/src/xrc/xh_spin.cpp | 2 +- contrib/src/xrc/xh_stbmp.cpp | 2 +- contrib/src/xrc/xh_stbox.cpp | 2 +- contrib/src/xrc/xh_stlin.cpp | 2 +- contrib/src/xrc/xh_sttxt.cpp | 2 +- contrib/src/xrc/xh_text.cpp | 2 +- contrib/src/xrc/xh_toolb.cpp | 6 +++--- contrib/src/xrc/xh_tree.cpp | 2 +- contrib/src/xrc/xh_unkwn.cpp | 2 +- contrib/src/xrc/xmlexpat.cpp | 2 +- contrib/src/xrc/xmlres.cpp | 14 +++++++------- src/xrc/xh_bmp.cpp | 2 +- src/xrc/xh_bmpbt.cpp | 2 +- src/xrc/xh_bttn.cpp | 2 +- src/xrc/xh_cald.cpp | 2 +- src/xrc/xh_chckb.cpp | 2 +- src/xrc/xh_chckl.cpp | 2 +- src/xrc/xh_choic.cpp | 2 +- src/xrc/xh_combo.cpp | 2 +- src/xrc/xh_dlg.cpp | 4 ++-- src/xrc/xh_frame.cpp | 4 ++-- src/xrc/xh_gauge.cpp | 2 +- src/xrc/xh_html.cpp | 2 +- src/xrc/xh_listb.cpp | 2 +- src/xrc/xh_listc.cpp | 2 +- src/xrc/xh_menu.cpp | 2 +- src/xrc/xh_notbk.cpp | 2 +- src/xrc/xh_panel.cpp | 2 +- src/xrc/xh_radbt.cpp | 2 +- src/xrc/xh_radbx.cpp | 2 +- src/xrc/xh_scrol.cpp | 2 +- src/xrc/xh_sizer.cpp | 4 ++-- src/xrc/xh_slidr.cpp | 2 +- src/xrc/xh_spin.cpp | 2 +- src/xrc/xh_stbmp.cpp | 2 +- src/xrc/xh_stbox.cpp | 2 +- src/xrc/xh_stlin.cpp | 2 +- src/xrc/xh_sttxt.cpp | 2 +- src/xrc/xh_text.cpp | 2 +- src/xrc/xh_toolb.cpp | 6 +++--- src/xrc/xh_tree.cpp | 2 +- src/xrc/xh_unkwn.cpp | 2 +- src/xrc/xmlexpat.cpp | 2 +- src/xrc/xmlres.cpp | 14 +++++++------- 66 files changed, 88 insertions(+), 88 deletions(-) diff --git a/contrib/src/xrc/xh_bmp.cpp b/contrib/src/xrc/xh_bmp.cpp index 181af55af3..1c6e18924d 100644 --- a/contrib/src/xrc/xh_bmp.cpp +++ b/contrib/src/xrc/xh_bmp.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_bmp.cpp -// Purpose: XML resource for wxBitmap and wxIcon +// Purpose: XRC resource for wxBitmap and wxIcon // Author: Vaclav Slavik // Created: 2000/09/09 // RCS-ID: $Id$ diff --git a/contrib/src/xrc/xh_bmpbt.cpp b/contrib/src/xrc/xh_bmpbt.cpp index 476609dfab..df3378796a 100644 --- a/contrib/src/xrc/xh_bmpbt.cpp +++ b/contrib/src/xrc/xh_bmpbt.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_bmpbt.cpp -// Purpose: XML resource for bitmap buttons +// Purpose: XRC resource for bitmap buttons // Author: Brian Gavin // Created: 2000/09/09 // RCS-ID: $Id$ diff --git a/contrib/src/xrc/xh_bttn.cpp b/contrib/src/xrc/xh_bttn.cpp index ab6d6f7b1c..1a0a7486ef 100644 --- a/contrib/src/xrc/xh_bttn.cpp +++ b/contrib/src/xrc/xh_bttn.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_bttn.cpp -// Purpose: XML resource for buttons +// Purpose: XRC resource for buttons // Author: Vaclav Slavik // Created: 2000/03/05 // RCS-ID: $Id$ diff --git a/contrib/src/xrc/xh_cald.cpp b/contrib/src/xrc/xh_cald.cpp index 4e59b88534..1367c5e8f7 100644 --- a/contrib/src/xrc/xh_cald.cpp +++ b/contrib/src/xrc/xh_cald.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_cald.cpp -// Purpose: XML resource for wxCalendarCtrl +// Purpose: XRC resource for wxCalendarCtrl // Author: Brian Gavin // Created: 2000/09/09 // RCS-ID: $Id$ diff --git a/contrib/src/xrc/xh_chckb.cpp b/contrib/src/xrc/xh_chckb.cpp index 9974211104..9bd2eb99ac 100644 --- a/contrib/src/xrc/xh_chckb.cpp +++ b/contrib/src/xrc/xh_chckb.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_chckb.cpp -// Purpose: XML resource for wxCheckBox +// Purpose: XRC resource for wxCheckBox // Author: Bob Mitchell // Created: 2000/03/21 // RCS-ID: $Id$ diff --git a/contrib/src/xrc/xh_chckl.cpp b/contrib/src/xrc/xh_chckl.cpp index b033b13321..c9f114ea92 100644 --- a/contrib/src/xrc/xh_chckl.cpp +++ b/contrib/src/xrc/xh_chckl.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_chckl.cpp -// Purpose: XML resource for wxCheckList +// Purpose: XRC resource for wxCheckList // Author: Bob Mitchell // Created: 2000/03/21 // RCS-ID: $Id$ diff --git a/contrib/src/xrc/xh_choic.cpp b/contrib/src/xrc/xh_choic.cpp index 2d2dc7b0c9..9c9e7aa2c1 100644 --- a/contrib/src/xrc/xh_choic.cpp +++ b/contrib/src/xrc/xh_choic.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_choic.cpp -// Purpose: XML resource for wxChoice +// Purpose: XRC resource for wxChoice // Author: Bob Mitchell // Created: 2000/03/21 // RCS-ID: $Id$ diff --git a/contrib/src/xrc/xh_combo.cpp b/contrib/src/xrc/xh_combo.cpp index 2353964bff..37c29089c3 100644 --- a/contrib/src/xrc/xh_combo.cpp +++ b/contrib/src/xrc/xh_combo.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_combo.cpp -// Purpose: XML resource for wxRadioBox +// Purpose: XRC resource for wxRadioBox // Author: Bob Mitchell // Created: 2000/03/21 // RCS-ID: $Id$ diff --git a/contrib/src/xrc/xh_dlg.cpp b/contrib/src/xrc/xh_dlg.cpp index 9aec62e835..c872225abb 100644 --- a/contrib/src/xrc/xh_dlg.cpp +++ b/contrib/src/xrc/xh_dlg.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_dlg.cpp -// Purpose: XML resource for dialogs +// Purpose: XRC resource for dialogs // Author: Vaclav Slavik // Created: 2000/03/05 // RCS-ID: $Id$ @@ -50,7 +50,7 @@ wxObject *wxDialogXmlHandler::DoCreateResource() { wxDialog *dlg = wxDynamicCast(m_instance, wxDialog); - wxASSERT_MSG(dlg, _("XML resource: Cannot create dialog without instance.")); + wxASSERT_MSG(dlg, _("XRC resource: Cannot create dialog without instance.")); dlg->Create(m_parentAsWindow, GetID(), diff --git a/contrib/src/xrc/xh_frame.cpp b/contrib/src/xrc/xh_frame.cpp index 7b5d003943..c8168e6e2b 100644 --- a/contrib/src/xrc/xh_frame.cpp +++ b/contrib/src/xrc/xh_frame.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_frame.cpp -// Purpose: XML resource for dialogs +// Purpose: XRC resource for dialogs // Author: Vaclav Slavik & Aleks. // Created: 2000/03/05 // RCS-ID: $Id$ @@ -55,7 +55,7 @@ wxObject *wxFrameXmlHandler::DoCreateResource() { wxFrame *frame = wxDynamicCast(m_instance, wxFrame); - wxASSERT_MSG(frame, _("XML resource: Cannot create dialog without instance.")); + wxASSERT_MSG(frame, _("XRC resource: Cannot create dialog without instance.")); frame->Create(m_parentAsWindow, GetID(), diff --git a/contrib/src/xrc/xh_gauge.cpp b/contrib/src/xrc/xh_gauge.cpp index dec1db540e..b49257895e 100644 --- a/contrib/src/xrc/xh_gauge.cpp +++ b/contrib/src/xrc/xh_gauge.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_gauge.cpp -// Purpose: XML resource for wxGauge +// Purpose: XRC resource for wxGauge // Author: Bob Mitchell // Created: 2000/03/21 // RCS-ID: $Id$ diff --git a/contrib/src/xrc/xh_html.cpp b/contrib/src/xrc/xh_html.cpp index dab79dc4c5..53b0808bdf 100644 --- a/contrib/src/xrc/xh_html.cpp +++ b/contrib/src/xrc/xh_html.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_html.cpp -// Purpose: XML resource for wxHtmlWindow +// Purpose: XRC resource for wxHtmlWindow // Author: Bob Mitchell // Created: 2000/03/21 // RCS-ID: $Id$ diff --git a/contrib/src/xrc/xh_listb.cpp b/contrib/src/xrc/xh_listb.cpp index 4cc771e16c..d1b48f96d7 100644 --- a/contrib/src/xrc/xh_listb.cpp +++ b/contrib/src/xrc/xh_listb.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_listb.cpp -// Purpose: XML resource for wxListBox +// Purpose: XRC resource for wxListBox // Author: Bob Mitchell & Vaclav Slavik // Created: 2000/07/29 // RCS-ID: $Id$ diff --git a/contrib/src/xrc/xh_listc.cpp b/contrib/src/xrc/xh_listc.cpp index ee21109f22..aeb7f5756e 100644 --- a/contrib/src/xrc/xh_listc.cpp +++ b/contrib/src/xrc/xh_listc.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_listc.cpp -// Purpose: XML resource for wxListCtrl +// Purpose: XRC resource for wxListCtrl // Author: Brian Gavin // Created: 2000/09/09 // RCS-ID: $Id$ diff --git a/contrib/src/xrc/xh_menu.cpp b/contrib/src/xrc/xh_menu.cpp index 86a27e88f7..709f4e2381 100644 --- a/contrib/src/xrc/xh_menu.cpp +++ b/contrib/src/xrc/xh_menu.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_menu.cpp -// Purpose: XML resource for menus and menubars +// Purpose: XRC resource for menus and menubars // Author: Vaclav Slavik // Created: 2000/03/05 // RCS-ID: $Id$ diff --git a/contrib/src/xrc/xh_notbk.cpp b/contrib/src/xrc/xh_notbk.cpp index fe648dc114..7cf5fb9ad2 100644 --- a/contrib/src/xrc/xh_notbk.cpp +++ b/contrib/src/xrc/xh_notbk.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_notbk.cpp -// Purpose: XML resource for wxNotebook +// Purpose: XRC resource for wxNotebook // Author: Vaclav Slavik // Created: 2000/03/21 // RCS-ID: $Id$ diff --git a/contrib/src/xrc/xh_panel.cpp b/contrib/src/xrc/xh_panel.cpp index d4d40956f6..bc3552dc7c 100644 --- a/contrib/src/xrc/xh_panel.cpp +++ b/contrib/src/xrc/xh_panel.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_panel.cpp -// Purpose: XML resource for panels +// Purpose: XRC resource for panels // Author: Vaclav Slavik // Created: 2000/03/05 // RCS-ID: $Id$ diff --git a/contrib/src/xrc/xh_radbt.cpp b/contrib/src/xrc/xh_radbt.cpp index 9caa453e62..a14b34a72f 100644 --- a/contrib/src/xrc/xh_radbt.cpp +++ b/contrib/src/xrc/xh_radbt.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_radbt.cpp -// Purpose: XML resource for wxRadioButton +// Purpose: XRC resource for wxRadioButton // Author: Bob Mitchell // Created: 2000/03/21 // RCS-ID: $Id$ diff --git a/contrib/src/xrc/xh_radbx.cpp b/contrib/src/xrc/xh_radbx.cpp index 7d22430aa4..17beaac5f9 100644 --- a/contrib/src/xrc/xh_radbx.cpp +++ b/contrib/src/xrc/xh_radbx.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_radbx.cpp -// Purpose: XML resource for wxRadioBox +// Purpose: XRC resource for wxRadioBox // Author: Bob Mitchell // Created: 2000/03/21 // RCS-ID: $Id$ diff --git a/contrib/src/xrc/xh_scrol.cpp b/contrib/src/xrc/xh_scrol.cpp index 22af94721c..0171894f87 100644 --- a/contrib/src/xrc/xh_scrol.cpp +++ b/contrib/src/xrc/xh_scrol.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_scrol.cpp -// Purpose: XML resource for wxScrollBar +// Purpose: XRC resource for wxScrollBar // Author: Brian Gavin // Created: 2000/09/09 // RCS-ID: $Id$ diff --git a/contrib/src/xrc/xh_sizer.cpp b/contrib/src/xrc/xh_sizer.cpp index 0a64cbcfad..7b6aff301b 100644 --- a/contrib/src/xrc/xh_sizer.cpp +++ b/contrib/src/xrc/xh_sizer.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_sizer.cpp -// Purpose: XML resource for wxBoxSizer +// Purpose: XRC resource for wxBoxSizer // Author: Vaclav Slavik // Created: 2000/03/21 // RCS-ID: $Id$ @@ -119,7 +119,7 @@ wxObject *wxSizerXmlHandler::DoCreateResource() else if (m_class == wxT("spacer")) { - wxCHECK_MSG(m_parentSizer, NULL, wxT("Incorrect syntax of XML resource: spacer not within sizer!")); + wxCHECK_MSG(m_parentSizer, NULL, wxT("Incorrect syntax of XRC resource: spacer not within sizer!")); wxSize sz = GetSize(); m_parentSizer->Add(sz.x, sz.y, GetLong(wxT("option")), GetStyle(wxT("flag")), GetDimension(wxT("border"))); diff --git a/contrib/src/xrc/xh_slidr.cpp b/contrib/src/xrc/xh_slidr.cpp index 52e0233810..c0aec23463 100644 --- a/contrib/src/xrc/xh_slidr.cpp +++ b/contrib/src/xrc/xh_slidr.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_slidr.cpp -// Purpose: XML resource for wxSlider +// Purpose: XRC resource for wxSlider // Author: Bob Mitchell // Created: 2000/03/21 // RCS-ID: $Id$ diff --git a/contrib/src/xrc/xh_spin.cpp b/contrib/src/xrc/xh_spin.cpp index bda1eebf90..3888c6daa3 100644 --- a/contrib/src/xrc/xh_spin.cpp +++ b/contrib/src/xrc/xh_spin.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_spin.cpp -// Purpose: XML resource for wxSpinButton +// Purpose: XRC resource for wxSpinButton // Author: Bob Mitchell // Created: 2000/03/21 // RCS-ID: $Id$ diff --git a/contrib/src/xrc/xh_stbmp.cpp b/contrib/src/xrc/xh_stbmp.cpp index 49371752a4..034fe3dd68 100644 --- a/contrib/src/xrc/xh_stbmp.cpp +++ b/contrib/src/xrc/xh_stbmp.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_stbmp.cpp -// Purpose: XML resource for wxStaticBitmap +// Purpose: XRC resource for wxStaticBitmap // Author: Vaclav Slavik // Created: 2000/04/22 // RCS-ID: $Id$ diff --git a/contrib/src/xrc/xh_stbox.cpp b/contrib/src/xrc/xh_stbox.cpp index 42b5e97967..f3a27b937e 100644 --- a/contrib/src/xrc/xh_stbox.cpp +++ b/contrib/src/xrc/xh_stbox.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_stbox.cpp -// Purpose: XML resource for wxStaticBox +// Purpose: XRC resource for wxStaticBox // Author: Brian Gavin // Created: 2000/09/09 // RCS-ID: $Id$ diff --git a/contrib/src/xrc/xh_stlin.cpp b/contrib/src/xrc/xh_stlin.cpp index 9418de0f3a..72955efbae 100644 --- a/contrib/src/xrc/xh_stlin.cpp +++ b/contrib/src/xrc/xh_stlin.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_stbox.cpp -// Purpose: XML resource for wxStaticLine +// Purpose: XRC resource for wxStaticLine // Author: Brian Gavin // Created: 2000/09/09 // RCS-ID: $Id$ diff --git a/contrib/src/xrc/xh_sttxt.cpp b/contrib/src/xrc/xh_sttxt.cpp index c188afb435..63f941fb8e 100644 --- a/contrib/src/xrc/xh_sttxt.cpp +++ b/contrib/src/xrc/xh_sttxt.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_sttxt.cpp -// Purpose: XML resource for wxStaticText +// Purpose: XRC resource for wxStaticText // Author: Bob Mitchell // Created: 2000/03/21 // RCS-ID: $Id$ diff --git a/contrib/src/xrc/xh_text.cpp b/contrib/src/xrc/xh_text.cpp index 26d8510c90..ac1573f297 100644 --- a/contrib/src/xrc/xh_text.cpp +++ b/contrib/src/xrc/xh_text.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_text.cpp -// Purpose: XML resource for wxTextCtrl +// Purpose: XRC resource for wxTextCtrl // Author: Aleksandras Gluchovas // Created: 2000/03/21 // RCS-ID: $Id$ diff --git a/contrib/src/xrc/xh_toolb.cpp b/contrib/src/xrc/xh_toolb.cpp index c86e521763..3cddf6f6b2 100644 --- a/contrib/src/xrc/xh_toolb.cpp +++ b/contrib/src/xrc/xh_toolb.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_toolb.cpp -// Purpose: XML resource for wxBoxSizer +// Purpose: XRC resource for wxBoxSizer // Author: Vaclav Slavik // Created: 2000/08/11 // RCS-ID: $Id$ @@ -40,7 +40,7 @@ wxObject *wxToolBarXmlHandler::DoCreateResource() { if (m_class == wxT("tool")) { - wxCHECK_MSG(m_toolbar, NULL, wxT("Incorrect syntax of XML resource: tool not within a toolbar!")); + wxCHECK_MSG(m_toolbar, NULL, wxT("Incorrect syntax of XRC resource: tool not within a toolbar!")); m_toolbar->AddTool(GetID(), GetBitmap(wxT("bitmap")), GetBitmap(wxT("bitmap2")), @@ -55,7 +55,7 @@ wxObject *wxToolBarXmlHandler::DoCreateResource() else if (m_class == wxT("separator")) { - wxCHECK_MSG(m_toolbar, NULL, wxT("Incorrect syntax of XML resource: separator not within a toolbar!")); + wxCHECK_MSG(m_toolbar, NULL, wxT("Incorrect syntax of XRC resource: separator not within a toolbar!")); m_toolbar->AddSeparator(); return m_toolbar; // must return non-NULL } diff --git a/contrib/src/xrc/xh_tree.cpp b/contrib/src/xrc/xh_tree.cpp index 5bec60c713..2e6f9f64f2 100644 --- a/contrib/src/xrc/xh_tree.cpp +++ b/contrib/src/xrc/xh_tree.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_tree.cpp -// Purpose: XML resource for wxTreeCtrl +// Purpose: XRC resource for wxTreeCtrl // Author: Brian Gavin // Created: 2000/09/09 // RCS-ID: $Id$ diff --git a/contrib/src/xrc/xh_unkwn.cpp b/contrib/src/xrc/xh_unkwn.cpp index 143ddefb97..ac97564018 100644 --- a/contrib/src/xrc/xh_unkwn.cpp +++ b/contrib/src/xrc/xh_unkwn.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_unkwn.cpp -// Purpose: XML resource for unknown widget +// Purpose: XRC resource for unknown widget // Author: Vaclav Slavik // Created: 2000/09/09 // RCS-ID: $Id$ diff --git a/contrib/src/xrc/xmlexpat.cpp b/contrib/src/xrc/xmlexpat.cpp index 47be0b67d1..9eaa5c7310 100644 --- a/contrib/src/xrc/xmlexpat.cpp +++ b/contrib/src/xrc/xmlexpat.cpp @@ -33,7 +33,7 @@ - handle unknown encodings - process all elements, including CDATA - - XML resources should automatically select desired encoding based on + - XRC resources should automatically select desired encoding based on runtime environment (?) (would need BIN and BINZ formats modification, too) diff --git a/contrib/src/xrc/xmlres.cpp b/contrib/src/xrc/xmlres.cpp index 8064dd9470..86c25e8d0c 100644 --- a/contrib/src/xrc/xmlres.cpp +++ b/contrib/src/xrc/xmlres.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xmlres.cpp -// Purpose: XML resources +// Purpose: XRC resources // Author: Vaclav Slavik // Created: 2000/03/05 // RCS-ID: $Id$ @@ -310,7 +310,7 @@ void wxXmlResource::UpdateResources() } else if (m_data[i].Doc->GetRoot()->GetName() != wxT("resource")) { - wxLogError(_("Invalid XML resource '%s': doesn't have root node 'resource'."), m_data[i].File.c_str()); + wxLogError(_("Invalid XRC resource '%s': doesn't have root node 'resource'."), m_data[i].File.c_str()); wxDELETE(m_data[i].Doc); } else @@ -368,7 +368,7 @@ wxXmlNode *wxXmlResource::FindResource(const wxString& name, const wxString& cla } } - wxLogError(_("XML resource '%s' (class '%s') not found!"), + wxLogError(_("XRC resource '%s' (class '%s') not found!"), name.c_str(), classname.c_str()); return NULL; } @@ -499,7 +499,7 @@ wxString wxXmlResourceHandler::GetText(const wxString& param) const wxChar *dt; wxChar amp_char; - // VS: First version of XML resources used $ instead of & (which is illegal in XML), + // VS: First version of XRC resources used $ instead of & (which is illegal in XML), // but later I realized that '_' fits this purpose much better (because // &File means "File with F underlined"). if (m_resource->CompareVersion(2,3,0,1) < 0) @@ -601,7 +601,7 @@ wxColour wxXmlResourceHandler::GetColour(const wxString& param) if (v.Length() != 7 || v[0u] != wxT('#') || wxSscanf(v.c_str(), wxT("#%lX"), &tmp) != 1) { - wxLogError(_("XML resource: Incorrect colour specification '%s' for property '%s'."), + wxLogError(_("XRC resource: Incorrect colour specification '%s' for property '%s'."), v.c_str(), param.c_str()); return wxNullColour; } @@ -621,7 +621,7 @@ wxBitmap wxXmlResourceHandler::GetBitmap(const wxString& param, wxSize size) wxFSFile *fsfile = GetCurFileSystem().OpenFile(name); if (fsfile == NULL) { - wxLogError(_("XML resource: Cannot create bitmap from '%s'."), param.c_str()); + wxLogError(_("XRC resource: Cannot create bitmap from '%s'."), param.c_str()); return wxNullBitmap; } wxImage img(*(fsfile->GetStream())); @@ -631,7 +631,7 @@ wxBitmap wxXmlResourceHandler::GetBitmap(const wxString& param, wxSize size) #endif if (!img.Ok()) { - wxLogError(_("XML resource: Cannot create bitmap from '%s'."), param.c_str()); + wxLogError(_("XRC resource: Cannot create bitmap from '%s'."), param.c_str()); return wxNullBitmap; } if (!(size == wxDefaultSize)) img.Rescale(size.x, size.y); diff --git a/src/xrc/xh_bmp.cpp b/src/xrc/xh_bmp.cpp index 181af55af3..1c6e18924d 100644 --- a/src/xrc/xh_bmp.cpp +++ b/src/xrc/xh_bmp.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_bmp.cpp -// Purpose: XML resource for wxBitmap and wxIcon +// Purpose: XRC resource for wxBitmap and wxIcon // Author: Vaclav Slavik // Created: 2000/09/09 // RCS-ID: $Id$ diff --git a/src/xrc/xh_bmpbt.cpp b/src/xrc/xh_bmpbt.cpp index 476609dfab..df3378796a 100644 --- a/src/xrc/xh_bmpbt.cpp +++ b/src/xrc/xh_bmpbt.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_bmpbt.cpp -// Purpose: XML resource for bitmap buttons +// Purpose: XRC resource for bitmap buttons // Author: Brian Gavin // Created: 2000/09/09 // RCS-ID: $Id$ diff --git a/src/xrc/xh_bttn.cpp b/src/xrc/xh_bttn.cpp index ab6d6f7b1c..1a0a7486ef 100644 --- a/src/xrc/xh_bttn.cpp +++ b/src/xrc/xh_bttn.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_bttn.cpp -// Purpose: XML resource for buttons +// Purpose: XRC resource for buttons // Author: Vaclav Slavik // Created: 2000/03/05 // RCS-ID: $Id$ diff --git a/src/xrc/xh_cald.cpp b/src/xrc/xh_cald.cpp index 4e59b88534..1367c5e8f7 100644 --- a/src/xrc/xh_cald.cpp +++ b/src/xrc/xh_cald.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_cald.cpp -// Purpose: XML resource for wxCalendarCtrl +// Purpose: XRC resource for wxCalendarCtrl // Author: Brian Gavin // Created: 2000/09/09 // RCS-ID: $Id$ diff --git a/src/xrc/xh_chckb.cpp b/src/xrc/xh_chckb.cpp index 9974211104..9bd2eb99ac 100644 --- a/src/xrc/xh_chckb.cpp +++ b/src/xrc/xh_chckb.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_chckb.cpp -// Purpose: XML resource for wxCheckBox +// Purpose: XRC resource for wxCheckBox // Author: Bob Mitchell // Created: 2000/03/21 // RCS-ID: $Id$ diff --git a/src/xrc/xh_chckl.cpp b/src/xrc/xh_chckl.cpp index b033b13321..c9f114ea92 100644 --- a/src/xrc/xh_chckl.cpp +++ b/src/xrc/xh_chckl.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_chckl.cpp -// Purpose: XML resource for wxCheckList +// Purpose: XRC resource for wxCheckList // Author: Bob Mitchell // Created: 2000/03/21 // RCS-ID: $Id$ diff --git a/src/xrc/xh_choic.cpp b/src/xrc/xh_choic.cpp index 2d2dc7b0c9..9c9e7aa2c1 100644 --- a/src/xrc/xh_choic.cpp +++ b/src/xrc/xh_choic.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_choic.cpp -// Purpose: XML resource for wxChoice +// Purpose: XRC resource for wxChoice // Author: Bob Mitchell // Created: 2000/03/21 // RCS-ID: $Id$ diff --git a/src/xrc/xh_combo.cpp b/src/xrc/xh_combo.cpp index 2353964bff..37c29089c3 100644 --- a/src/xrc/xh_combo.cpp +++ b/src/xrc/xh_combo.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_combo.cpp -// Purpose: XML resource for wxRadioBox +// Purpose: XRC resource for wxRadioBox // Author: Bob Mitchell // Created: 2000/03/21 // RCS-ID: $Id$ diff --git a/src/xrc/xh_dlg.cpp b/src/xrc/xh_dlg.cpp index 9aec62e835..c872225abb 100644 --- a/src/xrc/xh_dlg.cpp +++ b/src/xrc/xh_dlg.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_dlg.cpp -// Purpose: XML resource for dialogs +// Purpose: XRC resource for dialogs // Author: Vaclav Slavik // Created: 2000/03/05 // RCS-ID: $Id$ @@ -50,7 +50,7 @@ wxObject *wxDialogXmlHandler::DoCreateResource() { wxDialog *dlg = wxDynamicCast(m_instance, wxDialog); - wxASSERT_MSG(dlg, _("XML resource: Cannot create dialog without instance.")); + wxASSERT_MSG(dlg, _("XRC resource: Cannot create dialog without instance.")); dlg->Create(m_parentAsWindow, GetID(), diff --git a/src/xrc/xh_frame.cpp b/src/xrc/xh_frame.cpp index 7b5d003943..c8168e6e2b 100644 --- a/src/xrc/xh_frame.cpp +++ b/src/xrc/xh_frame.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_frame.cpp -// Purpose: XML resource for dialogs +// Purpose: XRC resource for dialogs // Author: Vaclav Slavik & Aleks. // Created: 2000/03/05 // RCS-ID: $Id$ @@ -55,7 +55,7 @@ wxObject *wxFrameXmlHandler::DoCreateResource() { wxFrame *frame = wxDynamicCast(m_instance, wxFrame); - wxASSERT_MSG(frame, _("XML resource: Cannot create dialog without instance.")); + wxASSERT_MSG(frame, _("XRC resource: Cannot create dialog without instance.")); frame->Create(m_parentAsWindow, GetID(), diff --git a/src/xrc/xh_gauge.cpp b/src/xrc/xh_gauge.cpp index dec1db540e..b49257895e 100644 --- a/src/xrc/xh_gauge.cpp +++ b/src/xrc/xh_gauge.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_gauge.cpp -// Purpose: XML resource for wxGauge +// Purpose: XRC resource for wxGauge // Author: Bob Mitchell // Created: 2000/03/21 // RCS-ID: $Id$ diff --git a/src/xrc/xh_html.cpp b/src/xrc/xh_html.cpp index dab79dc4c5..53b0808bdf 100644 --- a/src/xrc/xh_html.cpp +++ b/src/xrc/xh_html.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_html.cpp -// Purpose: XML resource for wxHtmlWindow +// Purpose: XRC resource for wxHtmlWindow // Author: Bob Mitchell // Created: 2000/03/21 // RCS-ID: $Id$ diff --git a/src/xrc/xh_listb.cpp b/src/xrc/xh_listb.cpp index 4cc771e16c..d1b48f96d7 100644 --- a/src/xrc/xh_listb.cpp +++ b/src/xrc/xh_listb.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_listb.cpp -// Purpose: XML resource for wxListBox +// Purpose: XRC resource for wxListBox // Author: Bob Mitchell & Vaclav Slavik // Created: 2000/07/29 // RCS-ID: $Id$ diff --git a/src/xrc/xh_listc.cpp b/src/xrc/xh_listc.cpp index ee21109f22..aeb7f5756e 100644 --- a/src/xrc/xh_listc.cpp +++ b/src/xrc/xh_listc.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_listc.cpp -// Purpose: XML resource for wxListCtrl +// Purpose: XRC resource for wxListCtrl // Author: Brian Gavin // Created: 2000/09/09 // RCS-ID: $Id$ diff --git a/src/xrc/xh_menu.cpp b/src/xrc/xh_menu.cpp index 86a27e88f7..709f4e2381 100644 --- a/src/xrc/xh_menu.cpp +++ b/src/xrc/xh_menu.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_menu.cpp -// Purpose: XML resource for menus and menubars +// Purpose: XRC resource for menus and menubars // Author: Vaclav Slavik // Created: 2000/03/05 // RCS-ID: $Id$ diff --git a/src/xrc/xh_notbk.cpp b/src/xrc/xh_notbk.cpp index fe648dc114..7cf5fb9ad2 100644 --- a/src/xrc/xh_notbk.cpp +++ b/src/xrc/xh_notbk.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_notbk.cpp -// Purpose: XML resource for wxNotebook +// Purpose: XRC resource for wxNotebook // Author: Vaclav Slavik // Created: 2000/03/21 // RCS-ID: $Id$ diff --git a/src/xrc/xh_panel.cpp b/src/xrc/xh_panel.cpp index d4d40956f6..bc3552dc7c 100644 --- a/src/xrc/xh_panel.cpp +++ b/src/xrc/xh_panel.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_panel.cpp -// Purpose: XML resource for panels +// Purpose: XRC resource for panels // Author: Vaclav Slavik // Created: 2000/03/05 // RCS-ID: $Id$ diff --git a/src/xrc/xh_radbt.cpp b/src/xrc/xh_radbt.cpp index 9caa453e62..a14b34a72f 100644 --- a/src/xrc/xh_radbt.cpp +++ b/src/xrc/xh_radbt.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_radbt.cpp -// Purpose: XML resource for wxRadioButton +// Purpose: XRC resource for wxRadioButton // Author: Bob Mitchell // Created: 2000/03/21 // RCS-ID: $Id$ diff --git a/src/xrc/xh_radbx.cpp b/src/xrc/xh_radbx.cpp index 7d22430aa4..17beaac5f9 100644 --- a/src/xrc/xh_radbx.cpp +++ b/src/xrc/xh_radbx.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_radbx.cpp -// Purpose: XML resource for wxRadioBox +// Purpose: XRC resource for wxRadioBox // Author: Bob Mitchell // Created: 2000/03/21 // RCS-ID: $Id$ diff --git a/src/xrc/xh_scrol.cpp b/src/xrc/xh_scrol.cpp index 22af94721c..0171894f87 100644 --- a/src/xrc/xh_scrol.cpp +++ b/src/xrc/xh_scrol.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_scrol.cpp -// Purpose: XML resource for wxScrollBar +// Purpose: XRC resource for wxScrollBar // Author: Brian Gavin // Created: 2000/09/09 // RCS-ID: $Id$ diff --git a/src/xrc/xh_sizer.cpp b/src/xrc/xh_sizer.cpp index 0a64cbcfad..7b6aff301b 100644 --- a/src/xrc/xh_sizer.cpp +++ b/src/xrc/xh_sizer.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_sizer.cpp -// Purpose: XML resource for wxBoxSizer +// Purpose: XRC resource for wxBoxSizer // Author: Vaclav Slavik // Created: 2000/03/21 // RCS-ID: $Id$ @@ -119,7 +119,7 @@ wxObject *wxSizerXmlHandler::DoCreateResource() else if (m_class == wxT("spacer")) { - wxCHECK_MSG(m_parentSizer, NULL, wxT("Incorrect syntax of XML resource: spacer not within sizer!")); + wxCHECK_MSG(m_parentSizer, NULL, wxT("Incorrect syntax of XRC resource: spacer not within sizer!")); wxSize sz = GetSize(); m_parentSizer->Add(sz.x, sz.y, GetLong(wxT("option")), GetStyle(wxT("flag")), GetDimension(wxT("border"))); diff --git a/src/xrc/xh_slidr.cpp b/src/xrc/xh_slidr.cpp index 52e0233810..c0aec23463 100644 --- a/src/xrc/xh_slidr.cpp +++ b/src/xrc/xh_slidr.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_slidr.cpp -// Purpose: XML resource for wxSlider +// Purpose: XRC resource for wxSlider // Author: Bob Mitchell // Created: 2000/03/21 // RCS-ID: $Id$ diff --git a/src/xrc/xh_spin.cpp b/src/xrc/xh_spin.cpp index bda1eebf90..3888c6daa3 100644 --- a/src/xrc/xh_spin.cpp +++ b/src/xrc/xh_spin.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_spin.cpp -// Purpose: XML resource for wxSpinButton +// Purpose: XRC resource for wxSpinButton // Author: Bob Mitchell // Created: 2000/03/21 // RCS-ID: $Id$ diff --git a/src/xrc/xh_stbmp.cpp b/src/xrc/xh_stbmp.cpp index 49371752a4..034fe3dd68 100644 --- a/src/xrc/xh_stbmp.cpp +++ b/src/xrc/xh_stbmp.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_stbmp.cpp -// Purpose: XML resource for wxStaticBitmap +// Purpose: XRC resource for wxStaticBitmap // Author: Vaclav Slavik // Created: 2000/04/22 // RCS-ID: $Id$ diff --git a/src/xrc/xh_stbox.cpp b/src/xrc/xh_stbox.cpp index 42b5e97967..f3a27b937e 100644 --- a/src/xrc/xh_stbox.cpp +++ b/src/xrc/xh_stbox.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_stbox.cpp -// Purpose: XML resource for wxStaticBox +// Purpose: XRC resource for wxStaticBox // Author: Brian Gavin // Created: 2000/09/09 // RCS-ID: $Id$ diff --git a/src/xrc/xh_stlin.cpp b/src/xrc/xh_stlin.cpp index 9418de0f3a..72955efbae 100644 --- a/src/xrc/xh_stlin.cpp +++ b/src/xrc/xh_stlin.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_stbox.cpp -// Purpose: XML resource for wxStaticLine +// Purpose: XRC resource for wxStaticLine // Author: Brian Gavin // Created: 2000/09/09 // RCS-ID: $Id$ diff --git a/src/xrc/xh_sttxt.cpp b/src/xrc/xh_sttxt.cpp index c188afb435..63f941fb8e 100644 --- a/src/xrc/xh_sttxt.cpp +++ b/src/xrc/xh_sttxt.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_sttxt.cpp -// Purpose: XML resource for wxStaticText +// Purpose: XRC resource for wxStaticText // Author: Bob Mitchell // Created: 2000/03/21 // RCS-ID: $Id$ diff --git a/src/xrc/xh_text.cpp b/src/xrc/xh_text.cpp index 26d8510c90..ac1573f297 100644 --- a/src/xrc/xh_text.cpp +++ b/src/xrc/xh_text.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_text.cpp -// Purpose: XML resource for wxTextCtrl +// Purpose: XRC resource for wxTextCtrl // Author: Aleksandras Gluchovas // Created: 2000/03/21 // RCS-ID: $Id$ diff --git a/src/xrc/xh_toolb.cpp b/src/xrc/xh_toolb.cpp index c86e521763..3cddf6f6b2 100644 --- a/src/xrc/xh_toolb.cpp +++ b/src/xrc/xh_toolb.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_toolb.cpp -// Purpose: XML resource for wxBoxSizer +// Purpose: XRC resource for wxBoxSizer // Author: Vaclav Slavik // Created: 2000/08/11 // RCS-ID: $Id$ @@ -40,7 +40,7 @@ wxObject *wxToolBarXmlHandler::DoCreateResource() { if (m_class == wxT("tool")) { - wxCHECK_MSG(m_toolbar, NULL, wxT("Incorrect syntax of XML resource: tool not within a toolbar!")); + wxCHECK_MSG(m_toolbar, NULL, wxT("Incorrect syntax of XRC resource: tool not within a toolbar!")); m_toolbar->AddTool(GetID(), GetBitmap(wxT("bitmap")), GetBitmap(wxT("bitmap2")), @@ -55,7 +55,7 @@ wxObject *wxToolBarXmlHandler::DoCreateResource() else if (m_class == wxT("separator")) { - wxCHECK_MSG(m_toolbar, NULL, wxT("Incorrect syntax of XML resource: separator not within a toolbar!")); + wxCHECK_MSG(m_toolbar, NULL, wxT("Incorrect syntax of XRC resource: separator not within a toolbar!")); m_toolbar->AddSeparator(); return m_toolbar; // must return non-NULL } diff --git a/src/xrc/xh_tree.cpp b/src/xrc/xh_tree.cpp index 5bec60c713..2e6f9f64f2 100644 --- a/src/xrc/xh_tree.cpp +++ b/src/xrc/xh_tree.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_tree.cpp -// Purpose: XML resource for wxTreeCtrl +// Purpose: XRC resource for wxTreeCtrl // Author: Brian Gavin // Created: 2000/09/09 // RCS-ID: $Id$ diff --git a/src/xrc/xh_unkwn.cpp b/src/xrc/xh_unkwn.cpp index 143ddefb97..ac97564018 100644 --- a/src/xrc/xh_unkwn.cpp +++ b/src/xrc/xh_unkwn.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_unkwn.cpp -// Purpose: XML resource for unknown widget +// Purpose: XRC resource for unknown widget // Author: Vaclav Slavik // Created: 2000/09/09 // RCS-ID: $Id$ diff --git a/src/xrc/xmlexpat.cpp b/src/xrc/xmlexpat.cpp index 47be0b67d1..9eaa5c7310 100644 --- a/src/xrc/xmlexpat.cpp +++ b/src/xrc/xmlexpat.cpp @@ -33,7 +33,7 @@ - handle unknown encodings - process all elements, including CDATA - - XML resources should automatically select desired encoding based on + - XRC resources should automatically select desired encoding based on runtime environment (?) (would need BIN and BINZ formats modification, too) diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp index 8064dd9470..86c25e8d0c 100644 --- a/src/xrc/xmlres.cpp +++ b/src/xrc/xmlres.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xmlres.cpp -// Purpose: XML resources +// Purpose: XRC resources // Author: Vaclav Slavik // Created: 2000/03/05 // RCS-ID: $Id$ @@ -310,7 +310,7 @@ void wxXmlResource::UpdateResources() } else if (m_data[i].Doc->GetRoot()->GetName() != wxT("resource")) { - wxLogError(_("Invalid XML resource '%s': doesn't have root node 'resource'."), m_data[i].File.c_str()); + wxLogError(_("Invalid XRC resource '%s': doesn't have root node 'resource'."), m_data[i].File.c_str()); wxDELETE(m_data[i].Doc); } else @@ -368,7 +368,7 @@ wxXmlNode *wxXmlResource::FindResource(const wxString& name, const wxString& cla } } - wxLogError(_("XML resource '%s' (class '%s') not found!"), + wxLogError(_("XRC resource '%s' (class '%s') not found!"), name.c_str(), classname.c_str()); return NULL; } @@ -499,7 +499,7 @@ wxString wxXmlResourceHandler::GetText(const wxString& param) const wxChar *dt; wxChar amp_char; - // VS: First version of XML resources used $ instead of & (which is illegal in XML), + // VS: First version of XRC resources used $ instead of & (which is illegal in XML), // but later I realized that '_' fits this purpose much better (because // &File means "File with F underlined"). if (m_resource->CompareVersion(2,3,0,1) < 0) @@ -601,7 +601,7 @@ wxColour wxXmlResourceHandler::GetColour(const wxString& param) if (v.Length() != 7 || v[0u] != wxT('#') || wxSscanf(v.c_str(), wxT("#%lX"), &tmp) != 1) { - wxLogError(_("XML resource: Incorrect colour specification '%s' for property '%s'."), + wxLogError(_("XRC resource: Incorrect colour specification '%s' for property '%s'."), v.c_str(), param.c_str()); return wxNullColour; } @@ -621,7 +621,7 @@ wxBitmap wxXmlResourceHandler::GetBitmap(const wxString& param, wxSize size) wxFSFile *fsfile = GetCurFileSystem().OpenFile(name); if (fsfile == NULL) { - wxLogError(_("XML resource: Cannot create bitmap from '%s'."), param.c_str()); + wxLogError(_("XRC resource: Cannot create bitmap from '%s'."), param.c_str()); return wxNullBitmap; } wxImage img(*(fsfile->GetStream())); @@ -631,7 +631,7 @@ wxBitmap wxXmlResourceHandler::GetBitmap(const wxString& param, wxSize size) #endif if (!img.Ok()) { - wxLogError(_("XML resource: Cannot create bitmap from '%s'."), param.c_str()); + wxLogError(_("XRC resource: Cannot create bitmap from '%s'."), param.c_str()); return wxNullBitmap; } if (!(size == wxDefaultSize)) img.Rescale(size.x, size.y); -- 2.45.2