Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

renamed wxXmlProperty to wxXmlAttribute, plus implied method names changes (bug #1751761)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47450 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-07-14 10:07:41 +00:00
parent ab0f37b97b
commit 288b6107e1
16 changed files with 291 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
utils/wxrc/wxrc.cpp
View File

@@ -65,8 +65,8 @@ private:
while (node)
{
if (node->GetName() == _T("object")
&& node->GetPropVal(_T("class"),&classValue)
&& node->GetPropVal(_T("name"),&nameValue))
&& node->GetAttribute(_T("class"),&classValue)
&& node->GetAttribute(_T("name"),&nameValue))
{
m_wdata.Add(XRCWidgetData(nameValue,classValue));
}
@@ -409,8 +409,8 @@ wxArrayString XmlResApp::PrepareTempFiles()
wxString classValue,nameValue;
while(node){
if(node->GetName() == _T("object")
&& node->GetPropVal(_T("class"),&classValue)
&& node->GetPropVal(_T("name"),&nameValue)){
&& node->GetAttribute(_T("class"),&classValue)
&& node->GetAttribute(_T("name"),&nameValue)){
aXRCWndClassData.Add(
XRCWndClassData(nameValue,classValue,node)
@@ -444,7 +444,7 @@ static bool NodeContainsFilename(wxXmlNode *node)
// wxBitmapButton:
wxXmlNode *parent = node->GetParent();
if (parent != NULL &&
parent->GetPropVal(_T("class"), _T("")) == _T("wxBitmapButton") &&
parent->GetAttribute(_T("class"), _T("")) == _T("wxBitmapButton") &&
(name == _T("focus") ||
name == _T("disabled") ||
name == _T("selected")))
@@ -453,7 +453,7 @@ static bool NodeContainsFilename(wxXmlNode *node)
// wxBitmap or wxIcon toplevel resources:
if ( name == _T("object") )
{
wxString klass = node->GetPropVal(_T("class"), wxEmptyString);
wxString klass = node->GetAttribute(_T("class"), wxEmptyString);
if (klass == _T("wxBitmap") ||
klass == _T("wxIcon") ||
klass == _T("data") )
@@ -463,7 +463,7 @@ static bool NodeContainsFilename(wxXmlNode *node)
// URLs in wxHtmlWindow:
if ( name == _T("url") &&
parent != NULL &&
parent->GetPropVal(_T("class"), _T("")) == _T("wxHtmlWindow") )
parent->GetAttribute(_T("class"), _T("")) == _T("wxHtmlWindow") )
{
// FIXME: this is wrong for e.g. http:// URLs
return true;
@@ -917,7 +917,7 @@ wxArrayString XmlResApp::FindStrings(wxXmlNode *node)
// ...and known to contain translatable string
{
if (!flagGettext ||
node->GetPropVal(_T("translate"), _T("1")) != _T("0"))
node->GetAttribute(_T("translate"), _T("1")) != _T("0"))
{
arr.Add(ConvertText(n->GetContent()));
}