cosmetic change: XML resource -> XRC resource

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12624 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-11-23 19:38:05 +00:00
parent 6264b550ad
commit b5d6954b87
66 changed files with 88 additions and 88 deletions

View File

@@ -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 // Author: Vaclav Slavik
// Created: 2000/09/09 // Created: 2000/09/09
// RCS-ID: $Id$ // RCS-ID: $Id$

View File

@@ -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 // Author: Brian Gavin
// Created: 2000/09/09 // Created: 2000/09/09
// RCS-ID: $Id$ // RCS-ID: $Id$

View File

@@ -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 // Author: Vaclav Slavik
// Created: 2000/03/05 // Created: 2000/03/05
// RCS-ID: $Id$ // RCS-ID: $Id$

View File

@@ -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 // Author: Brian Gavin
// Created: 2000/09/09 // Created: 2000/09/09
// RCS-ID: $Id$ // RCS-ID: $Id$

View File

@@ -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 // Author: Bob Mitchell
// Created: 2000/03/21 // Created: 2000/03/21
// RCS-ID: $Id$ // RCS-ID: $Id$

View File

@@ -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 // Author: Bob Mitchell
// Created: 2000/03/21 // Created: 2000/03/21
// RCS-ID: $Id$ // RCS-ID: $Id$

View File

@@ -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 // Author: Bob Mitchell
// Created: 2000/03/21 // Created: 2000/03/21
// RCS-ID: $Id$ // RCS-ID: $Id$

View File

@@ -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 // Author: Bob Mitchell
// Created: 2000/03/21 // Created: 2000/03/21
// RCS-ID: $Id$ // RCS-ID: $Id$

View File

@@ -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 // Author: Vaclav Slavik
// Created: 2000/03/05 // Created: 2000/03/05
// RCS-ID: $Id$ // 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, dlg->Create(m_parentAsWindow,
GetID(), GetID(),

View File

@@ -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. // Author: Vaclav Slavik & Aleks.
// Created: 2000/03/05 // Created: 2000/03/05
// RCS-ID: $Id$ // 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, frame->Create(m_parentAsWindow,
GetID(), GetID(),

View File

@@ -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 // Author: Bob Mitchell
// Created: 2000/03/21 // Created: 2000/03/21
// RCS-ID: $Id$ // RCS-ID: $Id$

View File

@@ -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 // Author: Bob Mitchell
// Created: 2000/03/21 // Created: 2000/03/21
// RCS-ID: $Id$ // RCS-ID: $Id$

View File

@@ -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 // Author: Bob Mitchell & Vaclav Slavik
// Created: 2000/07/29 // Created: 2000/07/29
// RCS-ID: $Id$ // RCS-ID: $Id$

View File

@@ -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 // Author: Brian Gavin
// Created: 2000/09/09 // Created: 2000/09/09
// RCS-ID: $Id$ // RCS-ID: $Id$

View File

@@ -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 // Author: Vaclav Slavik
// Created: 2000/03/05 // Created: 2000/03/05
// RCS-ID: $Id$ // RCS-ID: $Id$

View File

@@ -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 // Author: Vaclav Slavik
// Created: 2000/03/21 // Created: 2000/03/21
// RCS-ID: $Id$ // RCS-ID: $Id$

View File

@@ -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 // Author: Vaclav Slavik
// Created: 2000/03/05 // Created: 2000/03/05
// RCS-ID: $Id$ // RCS-ID: $Id$

View File

@@ -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 // Author: Bob Mitchell
// Created: 2000/03/21 // Created: 2000/03/21
// RCS-ID: $Id$ // RCS-ID: $Id$

View File

@@ -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 // Author: Bob Mitchell
// Created: 2000/03/21 // Created: 2000/03/21
// RCS-ID: $Id$ // RCS-ID: $Id$

View File

@@ -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 // Author: Brian Gavin
// Created: 2000/09/09 // Created: 2000/09/09
// RCS-ID: $Id$ // RCS-ID: $Id$

View File

@@ -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 // Author: Vaclav Slavik
// Created: 2000/03/21 // Created: 2000/03/21
// RCS-ID: $Id$ // 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(); wxSize sz = GetSize();
m_parentSizer->Add(sz.x, sz.y, m_parentSizer->Add(sz.x, sz.y,
GetLong(wxT("option")), GetStyle(wxT("flag")), GetDimension(wxT("border"))); GetLong(wxT("option")), GetStyle(wxT("flag")), GetDimension(wxT("border")));

View File

@@ -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 // Author: Bob Mitchell
// Created: 2000/03/21 // Created: 2000/03/21
// RCS-ID: $Id$ // RCS-ID: $Id$

View File

@@ -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 // Author: Bob Mitchell
// Created: 2000/03/21 // Created: 2000/03/21
// RCS-ID: $Id$ // RCS-ID: $Id$

View File

@@ -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 // Author: Vaclav Slavik
// Created: 2000/04/22 // Created: 2000/04/22
// RCS-ID: $Id$ // RCS-ID: $Id$

View File

@@ -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 // Author: Brian Gavin
// Created: 2000/09/09 // Created: 2000/09/09
// RCS-ID: $Id$ // RCS-ID: $Id$

View File

@@ -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 // Author: Brian Gavin
// Created: 2000/09/09 // Created: 2000/09/09
// RCS-ID: $Id$ // RCS-ID: $Id$

View File

@@ -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 // Author: Bob Mitchell
// Created: 2000/03/21 // Created: 2000/03/21
// RCS-ID: $Id$ // RCS-ID: $Id$

View File

@@ -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 // Author: Aleksandras Gluchovas
// Created: 2000/03/21 // Created: 2000/03/21
// RCS-ID: $Id$ // RCS-ID: $Id$

View File

@@ -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 // Author: Vaclav Slavik
// Created: 2000/08/11 // Created: 2000/08/11
// RCS-ID: $Id$ // 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(), m_toolbar->AddTool(GetID(),
GetBitmap(wxT("bitmap")), GetBitmap(wxT("bitmap")),
GetBitmap(wxT("bitmap2")), 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(); m_toolbar->AddSeparator();
return m_toolbar; // must return non-NULL return m_toolbar; // must return non-NULL
} }

View File

@@ -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 // Author: Brian Gavin
// Created: 2000/09/09 // Created: 2000/09/09
// RCS-ID: $Id$ // RCS-ID: $Id$

View File

@@ -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 // Author: Vaclav Slavik
// Created: 2000/09/09 // Created: 2000/09/09
// RCS-ID: $Id$ // RCS-ID: $Id$

View File

@@ -33,7 +33,7 @@
- handle unknown encodings - handle unknown encodings
- process all elements, including CDATA - 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, runtime environment (?) (would need BIN and BINZ formats modification,
too) too)

View File

@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: xmlres.cpp // Name: xmlres.cpp
// Purpose: XML resources // Purpose: XRC resources
// Author: Vaclav Slavik // Author: Vaclav Slavik
// Created: 2000/03/05 // Created: 2000/03/05
// RCS-ID: $Id$ // 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); wxDELETE(m_data[i].Doc);
} }
else 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()); name.c_str(), classname.c_str());
return NULL; return NULL;
} }
@@ -499,7 +499,7 @@ wxString wxXmlResourceHandler::GetText(const wxString& param)
const wxChar *dt; const wxChar *dt;
wxChar amp_char; 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 // but later I realized that '_' fits this purpose much better (because
// &File means "File with F underlined"). // &File means "File with F underlined").
if (m_resource->CompareVersion(2,3,0,1) < 0) 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('#') || if (v.Length() != 7 || v[0u] != wxT('#') ||
wxSscanf(v.c_str(), wxT("#%lX"), &tmp) != 1) 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()); v.c_str(), param.c_str());
return wxNullColour; return wxNullColour;
} }
@@ -621,7 +621,7 @@ wxBitmap wxXmlResourceHandler::GetBitmap(const wxString& param, wxSize size)
wxFSFile *fsfile = GetCurFileSystem().OpenFile(name); wxFSFile *fsfile = GetCurFileSystem().OpenFile(name);
if (fsfile == NULL) 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; return wxNullBitmap;
} }
wxImage img(*(fsfile->GetStream())); wxImage img(*(fsfile->GetStream()));
@@ -631,7 +631,7 @@ wxBitmap wxXmlResourceHandler::GetBitmap(const wxString& param, wxSize size)
#endif #endif
if (!img.Ok()) 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; return wxNullBitmap;
} }
if (!(size == wxDefaultSize)) img.Rescale(size.x, size.y); if (!(size == wxDefaultSize)) img.Rescale(size.x, size.y);

View File

@@ -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 // Author: Vaclav Slavik
// Created: 2000/09/09 // Created: 2000/09/09
// RCS-ID: $Id$ // RCS-ID: $Id$

View File

@@ -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 // Author: Brian Gavin
// Created: 2000/09/09 // Created: 2000/09/09
// RCS-ID: $Id$ // RCS-ID: $Id$

View File

@@ -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 // Author: Vaclav Slavik
// Created: 2000/03/05 // Created: 2000/03/05
// RCS-ID: $Id$ // RCS-ID: $Id$

View File

@@ -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 // Author: Brian Gavin
// Created: 2000/09/09 // Created: 2000/09/09
// RCS-ID: $Id$ // RCS-ID: $Id$

View File

@@ -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 // Author: Bob Mitchell
// Created: 2000/03/21 // Created: 2000/03/21
// RCS-ID: $Id$ // RCS-ID: $Id$

View File

@@ -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 // Author: Bob Mitchell
// Created: 2000/03/21 // Created: 2000/03/21
// RCS-ID: $Id$ // RCS-ID: $Id$

View File

@@ -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 // Author: Bob Mitchell
// Created: 2000/03/21 // Created: 2000/03/21
// RCS-ID: $Id$ // RCS-ID: $Id$

View File

@@ -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 // Author: Bob Mitchell
// Created: 2000/03/21 // Created: 2000/03/21
// RCS-ID: $Id$ // RCS-ID: $Id$

View File

@@ -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 // Author: Vaclav Slavik
// Created: 2000/03/05 // Created: 2000/03/05
// RCS-ID: $Id$ // 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, dlg->Create(m_parentAsWindow,
GetID(), GetID(),

View File

@@ -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. // Author: Vaclav Slavik & Aleks.
// Created: 2000/03/05 // Created: 2000/03/05
// RCS-ID: $Id$ // 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, frame->Create(m_parentAsWindow,
GetID(), GetID(),

View File

@@ -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 // Author: Bob Mitchell
// Created: 2000/03/21 // Created: 2000/03/21
// RCS-ID: $Id$ // RCS-ID: $Id$

View File

@@ -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 // Author: Bob Mitchell
// Created: 2000/03/21 // Created: 2000/03/21
// RCS-ID: $Id$ // RCS-ID: $Id$

View File

@@ -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 // Author: Bob Mitchell & Vaclav Slavik
// Created: 2000/07/29 // Created: 2000/07/29
// RCS-ID: $Id$ // RCS-ID: $Id$

View File

@@ -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 // Author: Brian Gavin
// Created: 2000/09/09 // Created: 2000/09/09
// RCS-ID: $Id$ // RCS-ID: $Id$

View File

@@ -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 // Author: Vaclav Slavik
// Created: 2000/03/05 // Created: 2000/03/05
// RCS-ID: $Id$ // RCS-ID: $Id$

View File

@@ -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 // Author: Vaclav Slavik
// Created: 2000/03/21 // Created: 2000/03/21
// RCS-ID: $Id$ // RCS-ID: $Id$

View File

@@ -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 // Author: Vaclav Slavik
// Created: 2000/03/05 // Created: 2000/03/05
// RCS-ID: $Id$ // RCS-ID: $Id$

View File

@@ -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 // Author: Bob Mitchell
// Created: 2000/03/21 // Created: 2000/03/21
// RCS-ID: $Id$ // RCS-ID: $Id$

View File

@@ -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 // Author: Bob Mitchell
// Created: 2000/03/21 // Created: 2000/03/21
// RCS-ID: $Id$ // RCS-ID: $Id$

View File

@@ -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 // Author: Brian Gavin
// Created: 2000/09/09 // Created: 2000/09/09
// RCS-ID: $Id$ // RCS-ID: $Id$

View File

@@ -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 // Author: Vaclav Slavik
// Created: 2000/03/21 // Created: 2000/03/21
// RCS-ID: $Id$ // 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(); wxSize sz = GetSize();
m_parentSizer->Add(sz.x, sz.y, m_parentSizer->Add(sz.x, sz.y,
GetLong(wxT("option")), GetStyle(wxT("flag")), GetDimension(wxT("border"))); GetLong(wxT("option")), GetStyle(wxT("flag")), GetDimension(wxT("border")));

View File

@@ -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 // Author: Bob Mitchell
// Created: 2000/03/21 // Created: 2000/03/21
// RCS-ID: $Id$ // RCS-ID: $Id$

View File

@@ -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 // Author: Bob Mitchell
// Created: 2000/03/21 // Created: 2000/03/21
// RCS-ID: $Id$ // RCS-ID: $Id$

View File

@@ -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 // Author: Vaclav Slavik
// Created: 2000/04/22 // Created: 2000/04/22
// RCS-ID: $Id$ // RCS-ID: $Id$

View File

@@ -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 // Author: Brian Gavin
// Created: 2000/09/09 // Created: 2000/09/09
// RCS-ID: $Id$ // RCS-ID: $Id$

View File

@@ -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 // Author: Brian Gavin
// Created: 2000/09/09 // Created: 2000/09/09
// RCS-ID: $Id$ // RCS-ID: $Id$

View File

@@ -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 // Author: Bob Mitchell
// Created: 2000/03/21 // Created: 2000/03/21
// RCS-ID: $Id$ // RCS-ID: $Id$

View File

@@ -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 // Author: Aleksandras Gluchovas
// Created: 2000/03/21 // Created: 2000/03/21
// RCS-ID: $Id$ // RCS-ID: $Id$

View File

@@ -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 // Author: Vaclav Slavik
// Created: 2000/08/11 // Created: 2000/08/11
// RCS-ID: $Id$ // 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(), m_toolbar->AddTool(GetID(),
GetBitmap(wxT("bitmap")), GetBitmap(wxT("bitmap")),
GetBitmap(wxT("bitmap2")), 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(); m_toolbar->AddSeparator();
return m_toolbar; // must return non-NULL return m_toolbar; // must return non-NULL
} }

View File

@@ -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 // Author: Brian Gavin
// Created: 2000/09/09 // Created: 2000/09/09
// RCS-ID: $Id$ // RCS-ID: $Id$

View File

@@ -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 // Author: Vaclav Slavik
// Created: 2000/09/09 // Created: 2000/09/09
// RCS-ID: $Id$ // RCS-ID: $Id$

View File

@@ -33,7 +33,7 @@
- handle unknown encodings - handle unknown encodings
- process all elements, including CDATA - 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, runtime environment (?) (would need BIN and BINZ formats modification,
too) too)

View File

@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: xmlres.cpp // Name: xmlres.cpp
// Purpose: XML resources // Purpose: XRC resources
// Author: Vaclav Slavik // Author: Vaclav Slavik
// Created: 2000/03/05 // Created: 2000/03/05
// RCS-ID: $Id$ // 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); wxDELETE(m_data[i].Doc);
} }
else 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()); name.c_str(), classname.c_str());
return NULL; return NULL;
} }
@@ -499,7 +499,7 @@ wxString wxXmlResourceHandler::GetText(const wxString& param)
const wxChar *dt; const wxChar *dt;
wxChar amp_char; 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 // but later I realized that '_' fits this purpose much better (because
// &File means "File with F underlined"). // &File means "File with F underlined").
if (m_resource->CompareVersion(2,3,0,1) < 0) 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('#') || if (v.Length() != 7 || v[0u] != wxT('#') ||
wxSscanf(v.c_str(), wxT("#%lX"), &tmp) != 1) 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()); v.c_str(), param.c_str());
return wxNullColour; return wxNullColour;
} }
@@ -621,7 +621,7 @@ wxBitmap wxXmlResourceHandler::GetBitmap(const wxString& param, wxSize size)
wxFSFile *fsfile = GetCurFileSystem().OpenFile(name); wxFSFile *fsfile = GetCurFileSystem().OpenFile(name);
if (fsfile == NULL) 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; return wxNullBitmap;
} }
wxImage img(*(fsfile->GetStream())); wxImage img(*(fsfile->GetStream()));
@@ -631,7 +631,7 @@ wxBitmap wxXmlResourceHandler::GetBitmap(const wxString& param, wxSize size)
#endif #endif
if (!img.Ok()) 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; return wxNullBitmap;
} }
if (!(size == wxDefaultSize)) img.Rescale(size.x, size.y); if (!(size == wxDefaultSize)) img.Rescale(size.x, size.y);