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

applied Brian's patch

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8741 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2000-11-15 22:57:54 +00:00
parent da4cc40ce0
commit 2c99715a09
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
contrib/utils/convertrc/rc2xml.cpp
View File

@@ -68,6 +68,11 @@ bool rc2xml::Convert(wxString rcfile, wxString xmlfile)
m_rc.Open(rcfile.c_str()); m_rc.Open(rcfile.c_str());
m_filesize=m_rc.Length(); m_filesize=m_rc.Length();
m_workingpath=wxPathOnly(rcfile);
m_targetpath=wxPathOnly(xmlfile)+"\\";
wxSetWorkingDirectory(m_workingpath);
bool result; bool result;
result=m_xmlfile.Open(xmlfile.c_str(),"w+t"); result=m_xmlfile.Open(xmlfile.c_str(),"w+t");
wxASSERT_MSG(result,"Couldn't create XML file"); wxASSERT_MSG(result,"Couldn't create XML file");
@@ -236,7 +241,7 @@ void rc2xml::ParsePushButton()
int x,y,width,height; int x,y,width,height;
ReadRect(x,y,width,height); ReadRect(x,y,width,height);
m_xmlfile.Write("\t\t<object class\"wxButton\""); m_xmlfile.Write("\t\t<object class=\"wxButton\"");
WriteBasicInfo(x,y,width,height,varname); WriteBasicInfo(x,y,width,height,varname);
WriteLabel(phrase); WriteLabel(phrase);
m_xmlfile.Write("\t\t</object>\n"); m_xmlfile.Write("\t\t</object>\n");
@@ -825,7 +830,7 @@ void rc2xml::WriteToolButton(wxString name,int index, int width, int height, wxB
wxRect r(x,0,width,height); wxRect r(x,0,width,height);
wxBitmap little; wxBitmap little;
little=bitmap.GetSubBitmap(r); little=bitmap.GetSubBitmap(r);
little.SaveFile(name,wxBITMAP_TYPE_BMP); little.SaveFile(m_targetpath+name,wxBITMAP_TYPE_BMP);
} }
void rc2xml::ParseStringTable(wxString varname) void rc2xml::ParseStringTable(wxString varname)
@@ -961,6 +966,8 @@ wxString rc2xml::CleanName(wxString name)
name.Replace("idr_",""); name.Replace("idr_","");
name.Replace("idb_",""); name.Replace("idb_","");
name.Replace("idc_",""); name.Replace("idc_","");
name.Replace(".ico","");
name.Replace(".bmp","");
return name; return name;
} }
// And the award for most messed up control goes to... // And the award for most messed up control goes to...
@@ -1114,6 +1121,7 @@ void rc2xml::WriteBitmap(wxString bitmapname)
wxString *bitmappath; wxString *bitmappath;
bitmappath=(wxString *)node->Data(); bitmappath=(wxString *)node->Data();
bitmapname=wxFileNameFromPath(*bitmappath);
wxBitmap bitmap; wxBitmap bitmap;
if (!bitmap.LoadFile(*bitmappath,wxBITMAP_TYPE_BMP )) if (!bitmap.LoadFile(*bitmappath,wxBITMAP_TYPE_BMP ))
wxLogError("Unable to load bitmap:"+*bitmappath); wxLogError("Unable to load bitmap:"+*bitmappath);
@@ -1122,7 +1130,7 @@ void rc2xml::WriteBitmap(wxString bitmapname)
bitmapname=CleanName(bitmapname); bitmapname=CleanName(bitmapname);
bitmapname+=".bmp"; bitmapname+=".bmp";
m_xmlfile.Write("\t\t\t<bitmap>"+bitmapname+"</bitmap>\n"); m_xmlfile.Write("\t\t\t<bitmap>"+bitmapname+"</bitmap>\n");
bitmap.SaveFile(bitmapname,wxBITMAP_TYPE_BMP); bitmap.SaveFile(m_targetpath+bitmapname,wxBITMAP_TYPE_BMP);
} }
void rc2xml::WriteIcon(wxString iconname) void rc2xml::WriteIcon(wxString iconname)
@@ -1144,12 +1152,12 @@ wxNode *node=m_iconlist->Find(iconname);
#else #else
bitmap = icon; bitmap = icon;
#endif #endif
iconname=wxFileNameFromPath(*iconpath);
//Make a bitmap file name //Make a bitmap file name
iconname=CleanName(iconname); iconname=CleanName(iconname);
iconname+=".bmp"; iconname+=".bmp";
m_xmlfile.Write("\t\t\t<bitmap>"+iconname+"</bitmap>\n"); m_xmlfile.Write("\t\t\t<bitmap>"+iconname+"</bitmap>\n");
bitmap.SaveFile(iconname,wxBITMAP_TYPE_BMP); bitmap.SaveFile(m_targetpath+iconname,wxBITMAP_TYPE_BMP);
} }