cosmetic change: XML resource -> XRC resource

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12624 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/src/xrc/xh_bmp.cpp b/contrib/src/xrc/xh_bmp.cpp
index 181af55af3d8ac59c6e9414d49dbe42a8062fca8..1c6e18924df0b8d4eb69d304dd7443c2f8e7c363 100644 (file)
--- a/contrib/src/xrc/xh_bmp.cpp
+++ b/contrib/src/xrc/xh_bmp.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_bmp.cpp
 /////////////////////////////////////////////////////////////////////////////
 // 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$
 // 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 476609dfab85c2abd18818b48b295c762720809b..df3378796ab2b258550cb18377040bc33b8c247e 100644 (file)
--- a/contrib/src/xrc/xh_bmpbt.cpp
+++ b/contrib/src/xrc/xh_bmpbt.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_bmpbt.cpp
 /////////////////////////////////////////////////////////////////////////////
 // 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$
 // 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 ab6d6f7b1cf2d6449693022bda7974e9fb62cd32..1a0a7486ef988e7fc9f18532af59c11284c395fc 100644 (file)
--- a/contrib/src/xrc/xh_bttn.cpp
+++ b/contrib/src/xrc/xh_bttn.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_bttn.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_bttn.cpp

-// Purpose:     XML resource for buttons
+// Purpose:     XRC resource for buttons

 // Author:      Vaclav Slavik
 // Created:     2000/03/05
 // RCS-ID:      $Id$
 // 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 4e59b8853438ab9c13280151f1640c10d821bc8e..1367c5e8f7cdf4bbc0034882e8fd4082e31055f3 100644 (file)
--- a/contrib/src/xrc/xh_cald.cpp
+++ b/contrib/src/xrc/xh_cald.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_cald.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_cald.cpp

-// Purpose:     XML resource for wxCalendarCtrl
+// Purpose:     XRC resource for wxCalendarCtrl

 // Author:      Brian Gavin
 // Created:     2000/09/09
 // RCS-ID:      $Id$
 // 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 9974211104dab560bf0d3cba497bff4980207eed..9bd2eb99ace4f78a886aa9a46e2b3cc917de3a88 100644 (file)
--- a/contrib/src/xrc/xh_chckb.cpp
+++ b/contrib/src/xrc/xh_chckb.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_chckb.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_chckb.cpp

-// Purpose:     XML resource for wxCheckBox
+// Purpose:     XRC resource for wxCheckBox

 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$
 // 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 b033b133214bbed2d5b2cccec8bd0410711e0f55..c9f114ea92d54db8923a0848668af5a7a7f3ebbd 100644 (file)
--- a/contrib/src/xrc/xh_chckl.cpp
+++ b/contrib/src/xrc/xh_chckl.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_chckl.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_chckl.cpp

-// Purpose:     XML resource for wxCheckList
+// Purpose:     XRC resource for wxCheckList

 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$
 // 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 2d2dc7b0c91c086ea6ddfdc4eee55809b7f343df..9c9e7aa2c172712a2d3a3e2ab4dfd29373be2e57 100644 (file)
--- a/contrib/src/xrc/xh_choic.cpp
+++ b/contrib/src/xrc/xh_choic.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_choic.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_choic.cpp

-// Purpose:     XML resource for wxChoice
+// Purpose:     XRC resource for wxChoice

 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$
 // 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 2353964bff9a185f9f0db08f0fadf54bf1f86dc7..37c29089c3e924a82b53f621c774519f42543f12 100644 (file)
--- a/contrib/src/xrc/xh_combo.cpp
+++ b/contrib/src/xrc/xh_combo.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_combo.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_combo.cpp

-// Purpose:     XML resource for wxRadioBox
+// Purpose:     XRC resource for wxRadioBox

 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$
 // 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 9aec62e83599f90c09773c780d04fc5661f6cedb..c872225abb1a38d6287dec6de0e810d07caae994 100644 (file)
--- a/contrib/src/xrc/xh_dlg.cpp
+++ b/contrib/src/xrc/xh_dlg.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_dlg.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_dlg.cpp

-// Purpose:     XML resource for dialogs
+// Purpose:     XRC resource for dialogs

 // Author:      Vaclav Slavik
 // Created:     2000/03/05
 // RCS-ID:      $Id$
 // Author:      Vaclav Slavik
 // Created:     2000/03/05
 // RCS-ID:      $Id$


@@ -50,7 +50,7 @@ wxObject *wxDialogXmlHandler::DoCreateResource()
 { 
     wxDialog *dlg = wxDynamicCast(m_instance, wxDialog);
     
 { 
     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(),
     
     dlg->Create(m_parentAsWindow,
                 GetID(),

diff --git a/contrib/src/xrc/xh_frame.cpp b/contrib/src/xrc/xh_frame.cpp
index 7b5d003943679049b86a3ef8df4e4facc80408c9..c8168e6e2b6af610673de1ef0ad62322f9bec80d 100644 (file)
--- a/contrib/src/xrc/xh_frame.cpp
+++ b/contrib/src/xrc/xh_frame.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_frame.cpp
 /////////////////////////////////////////////////////////////////////////////
 // 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$
 // Author:      Vaclav Slavik & Aleks.
 // Created:     2000/03/05
 // RCS-ID:      $Id$


@@ -55,7 +55,7 @@ wxObject *wxFrameXmlHandler::DoCreateResource()
 { 
     wxFrame *frame = wxDynamicCast(m_instance, wxFrame);
     
 { 
     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(),
     
     frame->Create(m_parentAsWindow,
                 GetID(),

diff --git a/contrib/src/xrc/xh_gauge.cpp b/contrib/src/xrc/xh_gauge.cpp
index dec1db540e1cac5bec961e332d56c608e74bec3b..b49257895e624da39ffd13f165b6e0f90ea6d776 100644 (file)
--- a/contrib/src/xrc/xh_gauge.cpp
+++ b/contrib/src/xrc/xh_gauge.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_gauge.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_gauge.cpp

-// Purpose:     XML resource for wxGauge
+// Purpose:     XRC resource for wxGauge

 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$
 // 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 dab79dc4c5258aea7a43cf1f78527a3897f368d9..53b0808bdf1ff5382e2ebd174607fb7608f48bff 100644 (file)
--- a/contrib/src/xrc/xh_html.cpp
+++ b/contrib/src/xrc/xh_html.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_html.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_html.cpp

-// Purpose:     XML resource for wxHtmlWindow
+// Purpose:     XRC resource for wxHtmlWindow

 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$
 // 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 4cc771e16cc84c8325e31ae6aaed72411a590ccd..d1b48f96d76d7119d22ee3e2338d40e8f65505cf 100644 (file)
--- a/contrib/src/xrc/xh_listb.cpp
+++ b/contrib/src/xrc/xh_listb.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_listb.cpp
 /////////////////////////////////////////////////////////////////////////////
 // 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$
 // 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 ee21109f221e7a8fddc0c426215bfe0467d6aa2a..aeb7f5756ecdeb0235ae90f024ba737a1865fdf5 100644 (file)
--- a/contrib/src/xrc/xh_listc.cpp
+++ b/contrib/src/xrc/xh_listc.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_listc.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_listc.cpp

-// Purpose:     XML resource for wxListCtrl
+// Purpose:     XRC resource for wxListCtrl

 // Author:      Brian Gavin
 // Created:     2000/09/09
 // RCS-ID:      $Id$
 // 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 86a27e88f73885b100b65a3019be7292e4eec6c8..709f4e23810cb18d2a75fc1da55ef5a8f4fe6de2 100644 (file)
--- a/contrib/src/xrc/xh_menu.cpp
+++ b/contrib/src/xrc/xh_menu.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_menu.cpp
 /////////////////////////////////////////////////////////////////////////////
 // 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$
 // 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 fe648dc114d940f4f68e52cc28205a358d88a85f..7cf5fb9ad22133fbac435976c4a8be95b54c75c6 100644 (file)
--- a/contrib/src/xrc/xh_notbk.cpp
+++ b/contrib/src/xrc/xh_notbk.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_notbk.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_notbk.cpp

-// Purpose:     XML resource for wxNotebook
+// Purpose:     XRC resource for wxNotebook

 // Author:      Vaclav Slavik
 // Created:     2000/03/21
 // RCS-ID:      $Id$
 // 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 d4d40956f68cc63ad5dd3c6b0a7e7b7ee91c2c06..bc3552dc7ca101af140938889798b0417fb574d5 100644 (file)
--- a/contrib/src/xrc/xh_panel.cpp
+++ b/contrib/src/xrc/xh_panel.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_panel.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_panel.cpp

-// Purpose:     XML resource for panels
+// Purpose:     XRC resource for panels

 // Author:      Vaclav Slavik
 // Created:     2000/03/05
 // RCS-ID:      $Id$
 // 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 9caa453e627f59730189f05cc488cb366ebedb40..a14b34a72f9e966b795418b745f4c1712ad5e861 100644 (file)
--- a/contrib/src/xrc/xh_radbt.cpp
+++ b/contrib/src/xrc/xh_radbt.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_radbt.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_radbt.cpp

-// Purpose:     XML resource for wxRadioButton
+// Purpose:     XRC resource for wxRadioButton

 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$
 // 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 7d22430aa419ca25535312137ce7e17d5de3978f..17beaac5f9315217dd56bff5c98d8134d7372ba8 100644 (file)
--- a/contrib/src/xrc/xh_radbx.cpp
+++ b/contrib/src/xrc/xh_radbx.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_radbx.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_radbx.cpp

-// Purpose:     XML resource for wxRadioBox
+// Purpose:     XRC resource for wxRadioBox

 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$
 // 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 22af94721c086c35d5aef62901f1ca908efa30fa..0171894f87cbe0321597ecb694f7fa699e43f69f 100644 (file)
--- a/contrib/src/xrc/xh_scrol.cpp
+++ b/contrib/src/xrc/xh_scrol.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_scrol.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_scrol.cpp

-// Purpose:     XML resource for wxScrollBar
+// Purpose:     XRC resource for wxScrollBar

 // Author:      Brian Gavin
 // Created:     2000/09/09
 // RCS-ID:      $Id$
 // 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 0a64cbcfadcb23e7c037df6a9068664c074e8aa6..7b6aff301baf69ca7bbed9fbacaf01b630d950b6 100644 (file)
--- a/contrib/src/xrc/xh_sizer.cpp
+++ b/contrib/src/xrc/xh_sizer.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_sizer.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_sizer.cpp

-// Purpose:     XML resource for wxBoxSizer
+// Purpose:     XRC resource for wxBoxSizer

 // Author:      Vaclav Slavik
 // Created:     2000/03/21
 // RCS-ID:      $Id$
 // Author:      Vaclav Slavik
 // Created:     2000/03/21
 // RCS-ID:      $Id$


@@ -119,7 +119,7 @@ wxObject *wxSizerXmlHandler::DoCreateResource()
     
     else if (m_class == wxT("spacer"))
     {
     
     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")));
         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 52e0233810b9874d87c4b5a2f071c24821356935..c0aec234639182c06834af26c75939e4d09195c7 100644 (file)
--- a/contrib/src/xrc/xh_slidr.cpp
+++ b/contrib/src/xrc/xh_slidr.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_slidr.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_slidr.cpp

-// Purpose:     XML resource for wxSlider
+// Purpose:     XRC resource for wxSlider

 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$
 // 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 bda1eebf9092f2585d939fd5e79190b945cd1a50..3888c6daa3779823bc31f6ba646cf8a191b7518c 100644 (file)
--- a/contrib/src/xrc/xh_spin.cpp
+++ b/contrib/src/xrc/xh_spin.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_spin.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_spin.cpp

-// Purpose:     XML resource for wxSpinButton
+// Purpose:     XRC resource for wxSpinButton

 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$
 // 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 49371752a49ebcdf79ba1021978479e5437e1120..034fe3dd68f8f40e9e3eb8bb80a8c22f10b640fe 100644 (file)
--- a/contrib/src/xrc/xh_stbmp.cpp
+++ b/contrib/src/xrc/xh_stbmp.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_stbmp.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_stbmp.cpp

-// Purpose:     XML resource for wxStaticBitmap
+// Purpose:     XRC resource for wxStaticBitmap

 // Author:      Vaclav Slavik
 // Created:     2000/04/22
 // RCS-ID:      $Id$
 // 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 42b5e979677f1ebd9acc80a90cc48b3ef1d74f29..f3a27b937ee6c997afeae85b46ad3caecd1c674b 100644 (file)
--- a/contrib/src/xrc/xh_stbox.cpp
+++ b/contrib/src/xrc/xh_stbox.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_stbox.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_stbox.cpp

-// Purpose:     XML resource for wxStaticBox
+// Purpose:     XRC resource for wxStaticBox

 // Author:      Brian Gavin
 // Created:     2000/09/09
 // RCS-ID:      $Id$
 // 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 9418de0f3aca7571243e06a217144cd47c314b91..72955efbaee59b5bf1730ed6ca9ae98100af0c3e 100644 (file)
--- a/contrib/src/xrc/xh_stlin.cpp
+++ b/contrib/src/xrc/xh_stlin.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_stbox.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_stbox.cpp

-// Purpose:     XML resource for wxStaticLine
+// Purpose:     XRC resource for wxStaticLine

 // Author:      Brian Gavin
 // Created:     2000/09/09
 // RCS-ID:      $Id$
 // 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 c188afb435b476d427dee952b1128a7b31eb848c..63f941fb8e8227726e6ca7dcacfedef5991c92bc 100644 (file)
--- a/contrib/src/xrc/xh_sttxt.cpp
+++ b/contrib/src/xrc/xh_sttxt.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_sttxt.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_sttxt.cpp

-// Purpose:     XML resource for wxStaticText
+// Purpose:     XRC resource for wxStaticText

 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$
 // 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 26d8510c90656cb6605e8801d0417a73377f1181..ac1573f297b776c868d107e0a774f485b56d32df 100644 (file)
--- a/contrib/src/xrc/xh_text.cpp
+++ b/contrib/src/xrc/xh_text.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_text.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_text.cpp

-// Purpose:     XML resource for wxTextCtrl
+// Purpose:     XRC resource for wxTextCtrl

 // Author:      Aleksandras Gluchovas
 // Created:     2000/03/21
 // RCS-ID:      $Id$
 // 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 c86e521763025fd608b92cb13610b5247d120644..3cddf6f6b271a348eb825728a3da50122982fc65 100644 (file)
--- a/contrib/src/xrc/xh_toolb.cpp
+++ b/contrib/src/xrc/xh_toolb.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_toolb.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_toolb.cpp

-// Purpose:     XML resource for wxBoxSizer
+// Purpose:     XRC resource for wxBoxSizer

 // Author:      Vaclav Slavik
 // Created:     2000/08/11
 // RCS-ID:      $Id$
 // Author:      Vaclav Slavik
 // Created:     2000/08/11
 // RCS-ID:      $Id$


@@ -40,7 +40,7 @@ wxObject *wxToolBarXmlHandler::DoCreateResource()
 { 
     if (m_class == wxT("tool"))
     {
 { 
     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")),
         m_toolbar->AddTool(GetID(),
                            GetBitmap(wxT("bitmap")),
                            GetBitmap(wxT("bitmap2")),


@@ -55,7 +55,7 @@ wxObject *wxToolBarXmlHandler::DoCreateResource()
     
     else if (m_class == wxT("separator"))
     {
     
     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
     }
         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 5bec60c713171c1e495ed34820f1d14ec0e1beb9..2e6f9f64f2aeb3913abeff4d32dd0f18a0cf115e 100644 (file)
--- a/contrib/src/xrc/xh_tree.cpp
+++ b/contrib/src/xrc/xh_tree.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_tree.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_tree.cpp

-// Purpose:     XML resource for wxTreeCtrl
+// Purpose:     XRC resource for wxTreeCtrl

 // Author:      Brian Gavin
 // Created:     2000/09/09
 // RCS-ID:      $Id$
 // 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 143ddefb9739677dd35eeaad89d13587d7dd8d9b..ac97564018d897fccc15ee3c028f96fe48eb8d9f 100644 (file)
--- a/contrib/src/xrc/xh_unkwn.cpp
+++ b/contrib/src/xrc/xh_unkwn.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_unkwn.cpp
 /////////////////////////////////////////////////////////////////////////////
 // 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$
 // 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 47be0b67d19c88d13be68daa07a50fffd78871c9..9eaa5c73100e7be7f3a84258136a1f04ac9e9edb 100644 (file)
--- a/contrib/src/xrc/xmlexpat.cpp
+++ b/contrib/src/xrc/xmlexpat.cpp
@@ -33,7 +33,7 @@
 
      - handle unknown encodings
      - process all elements, including CDATA
 
      - 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)
 
        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 8064dd94703f37f23aecebeb2381073dc48e58a4..86c25e8d0c0dfdb9d7b293d6251e854fd5d85393 100644 (file)
--- a/contrib/src/xrc/xmlres.cpp
+++ b/contrib/src/xrc/xmlres.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xmlres.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xmlres.cpp

-// Purpose:     XML resources
+// Purpose:     XRC resources

 // Author:      Vaclav Slavik
 // Created:     2000/03/05
 // RCS-ID:      $Id$
 // 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"))
             {
             }
             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
                 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;
 }
                name.c_str(), classname.c_str());
     return NULL;
 }


@@ -499,7 +499,7 @@ wxString wxXmlResourceHandler::GetText(const wxString& param)
     const wxChar *dt;
     wxChar amp_char;
 
     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)
     //     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)
     {
     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;
     }
                    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)
     {
     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()));
         return wxNullBitmap;
     }
     wxImage img(*(fsfile->GetStream()));


@@ -631,7 +631,7 @@ wxBitmap wxXmlResourceHandler::GetBitmap(const wxString& param, wxSize size)
 #endif
     if (!img.Ok())
     {
 #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);
         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 181af55af3d8ac59c6e9414d49dbe42a8062fca8..1c6e18924df0b8d4eb69d304dd7443c2f8e7c363 100644 (file)
--- a/src/xrc/xh_bmp.cpp
+++ b/src/xrc/xh_bmp.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_bmp.cpp
 /////////////////////////////////////////////////////////////////////////////
 // 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$
 // 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 476609dfab85c2abd18818b48b295c762720809b..df3378796ab2b258550cb18377040bc33b8c247e 100644 (file)
--- a/src/xrc/xh_bmpbt.cpp
+++ b/src/xrc/xh_bmpbt.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_bmpbt.cpp
 /////////////////////////////////////////////////////////////////////////////
 // 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$
 // 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 ab6d6f7b1cf2d6449693022bda7974e9fb62cd32..1a0a7486ef988e7fc9f18532af59c11284c395fc 100644 (file)
--- a/src/xrc/xh_bttn.cpp
+++ b/src/xrc/xh_bttn.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_bttn.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_bttn.cpp

-// Purpose:     XML resource for buttons
+// Purpose:     XRC resource for buttons

 // Author:      Vaclav Slavik
 // Created:     2000/03/05
 // RCS-ID:      $Id$
 // 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 4e59b8853438ab9c13280151f1640c10d821bc8e..1367c5e8f7cdf4bbc0034882e8fd4082e31055f3 100644 (file)
--- a/src/xrc/xh_cald.cpp
+++ b/src/xrc/xh_cald.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_cald.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_cald.cpp

-// Purpose:     XML resource for wxCalendarCtrl
+// Purpose:     XRC resource for wxCalendarCtrl

 // Author:      Brian Gavin
 // Created:     2000/09/09
 // RCS-ID:      $Id$
 // 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 9974211104dab560bf0d3cba497bff4980207eed..9bd2eb99ace4f78a886aa9a46e2b3cc917de3a88 100644 (file)
--- a/src/xrc/xh_chckb.cpp
+++ b/src/xrc/xh_chckb.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_chckb.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_chckb.cpp

-// Purpose:     XML resource for wxCheckBox
+// Purpose:     XRC resource for wxCheckBox

 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$
 // 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 b033b133214bbed2d5b2cccec8bd0410711e0f55..c9f114ea92d54db8923a0848668af5a7a7f3ebbd 100644 (file)
--- a/src/xrc/xh_chckl.cpp
+++ b/src/xrc/xh_chckl.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_chckl.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_chckl.cpp

-// Purpose:     XML resource for wxCheckList
+// Purpose:     XRC resource for wxCheckList

 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$
 // 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 2d2dc7b0c91c086ea6ddfdc4eee55809b7f343df..9c9e7aa2c172712a2d3a3e2ab4dfd29373be2e57 100644 (file)
--- a/src/xrc/xh_choic.cpp
+++ b/src/xrc/xh_choic.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_choic.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_choic.cpp

-// Purpose:     XML resource for wxChoice
+// Purpose:     XRC resource for wxChoice

 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$
 // 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 2353964bff9a185f9f0db08f0fadf54bf1f86dc7..37c29089c3e924a82b53f621c774519f42543f12 100644 (file)
--- a/src/xrc/xh_combo.cpp
+++ b/src/xrc/xh_combo.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_combo.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_combo.cpp

-// Purpose:     XML resource for wxRadioBox
+// Purpose:     XRC resource for wxRadioBox

 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$
 // 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 9aec62e83599f90c09773c780d04fc5661f6cedb..c872225abb1a38d6287dec6de0e810d07caae994 100644 (file)
--- a/src/xrc/xh_dlg.cpp
+++ b/src/xrc/xh_dlg.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_dlg.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_dlg.cpp

-// Purpose:     XML resource for dialogs
+// Purpose:     XRC resource for dialogs

 // Author:      Vaclav Slavik
 // Created:     2000/03/05
 // RCS-ID:      $Id$
 // Author:      Vaclav Slavik
 // Created:     2000/03/05
 // RCS-ID:      $Id$


@@ -50,7 +50,7 @@ wxObject *wxDialogXmlHandler::DoCreateResource()
 { 
     wxDialog *dlg = wxDynamicCast(m_instance, wxDialog);
     
 { 
     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(),
     
     dlg->Create(m_parentAsWindow,
                 GetID(),

diff --git a/src/xrc/xh_frame.cpp b/src/xrc/xh_frame.cpp
index 7b5d003943679049b86a3ef8df4e4facc80408c9..c8168e6e2b6af610673de1ef0ad62322f9bec80d 100644 (file)
--- a/src/xrc/xh_frame.cpp
+++ b/src/xrc/xh_frame.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_frame.cpp
 /////////////////////////////////////////////////////////////////////////////
 // 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$
 // Author:      Vaclav Slavik & Aleks.
 // Created:     2000/03/05
 // RCS-ID:      $Id$


@@ -55,7 +55,7 @@ wxObject *wxFrameXmlHandler::DoCreateResource()
 { 
     wxFrame *frame = wxDynamicCast(m_instance, wxFrame);
     
 { 
     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(),
     
     frame->Create(m_parentAsWindow,
                 GetID(),

diff --git a/src/xrc/xh_gauge.cpp b/src/xrc/xh_gauge.cpp
index dec1db540e1cac5bec961e332d56c608e74bec3b..b49257895e624da39ffd13f165b6e0f90ea6d776 100644 (file)
--- a/src/xrc/xh_gauge.cpp
+++ b/src/xrc/xh_gauge.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_gauge.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_gauge.cpp

-// Purpose:     XML resource for wxGauge
+// Purpose:     XRC resource for wxGauge

 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$
 // 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 dab79dc4c5258aea7a43cf1f78527a3897f368d9..53b0808bdf1ff5382e2ebd174607fb7608f48bff 100644 (file)
--- a/src/xrc/xh_html.cpp
+++ b/src/xrc/xh_html.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_html.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_html.cpp

-// Purpose:     XML resource for wxHtmlWindow
+// Purpose:     XRC resource for wxHtmlWindow

 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$
 // 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 4cc771e16cc84c8325e31ae6aaed72411a590ccd..d1b48f96d76d7119d22ee3e2338d40e8f65505cf 100644 (file)
--- a/src/xrc/xh_listb.cpp
+++ b/src/xrc/xh_listb.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_listb.cpp
 /////////////////////////////////////////////////////////////////////////////
 // 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$
 // 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 ee21109f221e7a8fddc0c426215bfe0467d6aa2a..aeb7f5756ecdeb0235ae90f024ba737a1865fdf5 100644 (file)
--- a/src/xrc/xh_listc.cpp
+++ b/src/xrc/xh_listc.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_listc.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_listc.cpp

-// Purpose:     XML resource for wxListCtrl
+// Purpose:     XRC resource for wxListCtrl

 // Author:      Brian Gavin
 // Created:     2000/09/09
 // RCS-ID:      $Id$
 // 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 86a27e88f73885b100b65a3019be7292e4eec6c8..709f4e23810cb18d2a75fc1da55ef5a8f4fe6de2 100644 (file)
--- a/src/xrc/xh_menu.cpp
+++ b/src/xrc/xh_menu.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_menu.cpp
 /////////////////////////////////////////////////////////////////////////////
 // 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$
 // 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 fe648dc114d940f4f68e52cc28205a358d88a85f..7cf5fb9ad22133fbac435976c4a8be95b54c75c6 100644 (file)
--- a/src/xrc/xh_notbk.cpp
+++ b/src/xrc/xh_notbk.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_notbk.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_notbk.cpp

-// Purpose:     XML resource for wxNotebook
+// Purpose:     XRC resource for wxNotebook

 // Author:      Vaclav Slavik
 // Created:     2000/03/21
 // RCS-ID:      $Id$
 // 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 d4d40956f68cc63ad5dd3c6b0a7e7b7ee91c2c06..bc3552dc7ca101af140938889798b0417fb574d5 100644 (file)
--- a/src/xrc/xh_panel.cpp
+++ b/src/xrc/xh_panel.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_panel.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_panel.cpp

-// Purpose:     XML resource for panels
+// Purpose:     XRC resource for panels

 // Author:      Vaclav Slavik
 // Created:     2000/03/05
 // RCS-ID:      $Id$
 // 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 9caa453e627f59730189f05cc488cb366ebedb40..a14b34a72f9e966b795418b745f4c1712ad5e861 100644 (file)
--- a/src/xrc/xh_radbt.cpp
+++ b/src/xrc/xh_radbt.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_radbt.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_radbt.cpp

-// Purpose:     XML resource for wxRadioButton
+// Purpose:     XRC resource for wxRadioButton

 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$
 // 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 7d22430aa419ca25535312137ce7e17d5de3978f..17beaac5f9315217dd56bff5c98d8134d7372ba8 100644 (file)
--- a/src/xrc/xh_radbx.cpp
+++ b/src/xrc/xh_radbx.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_radbx.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_radbx.cpp

-// Purpose:     XML resource for wxRadioBox
+// Purpose:     XRC resource for wxRadioBox

 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$
 // 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 22af94721c086c35d5aef62901f1ca908efa30fa..0171894f87cbe0321597ecb694f7fa699e43f69f 100644 (file)
--- a/src/xrc/xh_scrol.cpp
+++ b/src/xrc/xh_scrol.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_scrol.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_scrol.cpp

-// Purpose:     XML resource for wxScrollBar
+// Purpose:     XRC resource for wxScrollBar

 // Author:      Brian Gavin
 // Created:     2000/09/09
 // RCS-ID:      $Id$
 // 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 0a64cbcfadcb23e7c037df6a9068664c074e8aa6..7b6aff301baf69ca7bbed9fbacaf01b630d950b6 100644 (file)
--- a/src/xrc/xh_sizer.cpp
+++ b/src/xrc/xh_sizer.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_sizer.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_sizer.cpp

-// Purpose:     XML resource for wxBoxSizer
+// Purpose:     XRC resource for wxBoxSizer

 // Author:      Vaclav Slavik
 // Created:     2000/03/21
 // RCS-ID:      $Id$
 // Author:      Vaclav Slavik
 // Created:     2000/03/21
 // RCS-ID:      $Id$


@@ -119,7 +119,7 @@ wxObject *wxSizerXmlHandler::DoCreateResource()
     
     else if (m_class == wxT("spacer"))
     {
     
     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")));
         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 52e0233810b9874d87c4b5a2f071c24821356935..c0aec234639182c06834af26c75939e4d09195c7 100644 (file)
--- a/src/xrc/xh_slidr.cpp
+++ b/src/xrc/xh_slidr.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_slidr.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_slidr.cpp

-// Purpose:     XML resource for wxSlider
+// Purpose:     XRC resource for wxSlider

 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$
 // 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 bda1eebf9092f2585d939fd5e79190b945cd1a50..3888c6daa3779823bc31f6ba646cf8a191b7518c 100644 (file)
--- a/src/xrc/xh_spin.cpp
+++ b/src/xrc/xh_spin.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_spin.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_spin.cpp

-// Purpose:     XML resource for wxSpinButton
+// Purpose:     XRC resource for wxSpinButton

 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$
 // 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 49371752a49ebcdf79ba1021978479e5437e1120..034fe3dd68f8f40e9e3eb8bb80a8c22f10b640fe 100644 (file)
--- a/src/xrc/xh_stbmp.cpp
+++ b/src/xrc/xh_stbmp.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_stbmp.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_stbmp.cpp

-// Purpose:     XML resource for wxStaticBitmap
+// Purpose:     XRC resource for wxStaticBitmap

 // Author:      Vaclav Slavik
 // Created:     2000/04/22
 // RCS-ID:      $Id$
 // 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 42b5e979677f1ebd9acc80a90cc48b3ef1d74f29..f3a27b937ee6c997afeae85b46ad3caecd1c674b 100644 (file)
--- a/src/xrc/xh_stbox.cpp
+++ b/src/xrc/xh_stbox.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_stbox.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_stbox.cpp

-// Purpose:     XML resource for wxStaticBox
+// Purpose:     XRC resource for wxStaticBox

 // Author:      Brian Gavin
 // Created:     2000/09/09
 // RCS-ID:      $Id$
 // 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 9418de0f3aca7571243e06a217144cd47c314b91..72955efbaee59b5bf1730ed6ca9ae98100af0c3e 100644 (file)
--- a/src/xrc/xh_stlin.cpp
+++ b/src/xrc/xh_stlin.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_stbox.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_stbox.cpp

-// Purpose:     XML resource for wxStaticLine
+// Purpose:     XRC resource for wxStaticLine

 // Author:      Brian Gavin
 // Created:     2000/09/09
 // RCS-ID:      $Id$
 // 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 c188afb435b476d427dee952b1128a7b31eb848c..63f941fb8e8227726e6ca7dcacfedef5991c92bc 100644 (file)
--- a/src/xrc/xh_sttxt.cpp
+++ b/src/xrc/xh_sttxt.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_sttxt.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_sttxt.cpp

-// Purpose:     XML resource for wxStaticText
+// Purpose:     XRC resource for wxStaticText

 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$
 // 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 26d8510c90656cb6605e8801d0417a73377f1181..ac1573f297b776c868d107e0a774f485b56d32df 100644 (file)
--- a/src/xrc/xh_text.cpp
+++ b/src/xrc/xh_text.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_text.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_text.cpp

-// Purpose:     XML resource for wxTextCtrl
+// Purpose:     XRC resource for wxTextCtrl

 // Author:      Aleksandras Gluchovas
 // Created:     2000/03/21
 // RCS-ID:      $Id$
 // 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 c86e521763025fd608b92cb13610b5247d120644..3cddf6f6b271a348eb825728a3da50122982fc65 100644 (file)
--- a/src/xrc/xh_toolb.cpp
+++ b/src/xrc/xh_toolb.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_toolb.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_toolb.cpp

-// Purpose:     XML resource for wxBoxSizer
+// Purpose:     XRC resource for wxBoxSizer

 // Author:      Vaclav Slavik
 // Created:     2000/08/11
 // RCS-ID:      $Id$
 // Author:      Vaclav Slavik
 // Created:     2000/08/11
 // RCS-ID:      $Id$


@@ -40,7 +40,7 @@ wxObject *wxToolBarXmlHandler::DoCreateResource()
 { 
     if (m_class == wxT("tool"))
     {
 { 
     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")),
         m_toolbar->AddTool(GetID(),
                            GetBitmap(wxT("bitmap")),
                            GetBitmap(wxT("bitmap2")),


@@ -55,7 +55,7 @@ wxObject *wxToolBarXmlHandler::DoCreateResource()
     
     else if (m_class == wxT("separator"))
     {
     
     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
     }
         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 5bec60c713171c1e495ed34820f1d14ec0e1beb9..2e6f9f64f2aeb3913abeff4d32dd0f18a0cf115e 100644 (file)
--- a/src/xrc/xh_tree.cpp
+++ b/src/xrc/xh_tree.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_tree.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_tree.cpp

-// Purpose:     XML resource for wxTreeCtrl
+// Purpose:     XRC resource for wxTreeCtrl

 // Author:      Brian Gavin
 // Created:     2000/09/09
 // RCS-ID:      $Id$
 // 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 143ddefb9739677dd35eeaad89d13587d7dd8d9b..ac97564018d897fccc15ee3c028f96fe48eb8d9f 100644 (file)
--- a/src/xrc/xh_unkwn.cpp
+++ b/src/xrc/xh_unkwn.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_unkwn.cpp
 /////////////////////////////////////////////////////////////////////////////
 // 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$
 // Author:      Vaclav Slavik
 // Created:     2000/09/09
 // RCS-ID:      $Id$

diff --git a/src/xrc/xmlexpat.cpp b/src/xrc/xmlexpat.cpp
index 47be0b67d19c88d13be68daa07a50fffd78871c9..9eaa5c73100e7be7f3a84258136a1f04ac9e9edb 100644 (file)
--- a/src/xrc/xmlexpat.cpp
+++ b/src/xrc/xmlexpat.cpp
@@ -33,7 +33,7 @@
 
      - handle unknown encodings
      - process all elements, including CDATA
 
      - 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)
 
        runtime environment (?) (would need BIN and BINZ formats modification,
        too)
 

diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp
index 8064dd94703f37f23aecebeb2381073dc48e58a4..86c25e8d0c0dfdb9d7b293d6251e854fd5d85393 100644 (file)
--- a/src/xrc/xmlres.cpp
+++ b/src/xrc/xmlres.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xmlres.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xmlres.cpp

-// Purpose:     XML resources
+// Purpose:     XRC resources

 // Author:      Vaclav Slavik
 // Created:     2000/03/05
 // RCS-ID:      $Id$
 // 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"))
             {
             }
             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
                 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;
 }
                name.c_str(), classname.c_str());
     return NULL;
 }


@@ -499,7 +499,7 @@ wxString wxXmlResourceHandler::GetText(const wxString& param)
     const wxChar *dt;
     wxChar amp_char;
 
     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)
     //     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)
     {
     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;
     }
                    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)
     {
     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()));
         return wxNullBitmap;
     }
     wxImage img(*(fsfile->GetStream()));


@@ -631,7 +631,7 @@ wxBitmap wxXmlResourceHandler::GetBitmap(const wxString& param, wxSize size)
 #endif
     if (!img.Ok())
     {
 #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);
         return wxNullBitmap;
     }
     if (!(size == wxDefaultSize)) img.Rescale(size.x, size.y);