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

Source cleaning, warning fixes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31333 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-01-13 19:57:24 +00:00
parent 34c9978dac
commit 2ad1ff540f
1 changed files with 38 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
utils/wxrc/wxrc.cpp
View File

@@ -44,6 +44,7 @@ private:
wxString m_class; wxString m_class;
wxString m_name; wxString m_name;
}; };
#include "wx/arrimpl.cpp" #include "wx/arrimpl.cpp"
WX_DECLARE_OBJARRAY(XRCWidgetData,ArrayOfXRCWidgetData); WX_DECLARE_OBJARRAY(XRCWidgetData,ArrayOfXRCWidgetData);
WX_DEFINE_OBJARRAY(ArrayOfXRCWidgetData); WX_DEFINE_OBJARRAY(ArrayOfXRCWidgetData);
@@ -77,20 +78,22 @@ private:
public: public:
XRCWndClassData(const wxString& className,const wxString& parentClassName, const wxXmlNode* node) : XRCWndClassData(const wxString& className,const wxString& parentClassName, const wxXmlNode* node) :
m_className(className) , m_parentClassName(parentClassName) { m_className(className) , m_parentClassName(parentClassName)
{
BrowseXmlNode(node->GetChildren()); BrowseXmlNode(node->GetChildren());
} }
const ArrayOfXRCWidgetData& GetWidgetData(){ const ArrayOfXRCWidgetData& GetWidgetData()
{
return m_wdata; return m_wdata;
} }
bool IsRealClass(const wxString& name) bool IsRealClass(const wxString& name)
{ {
if (name == _T("tool") || name == _T("unknown") || if (name == _T("tool") ||
name == _T("notebookpage") || name == _T("separator") || name == _T("unknown") ||
name == _T("notebookpage") ||
name == _T("separator") ||
name == _T("sizeritem") || name == _T("sizeritem") ||
name == _T("wxMenuItem")) name == _T("wxMenuItem"))
{ {
@@ -108,8 +111,8 @@ public:
for(i=0;i<m_wdata.Count();++i) for(i=0;i<m_wdata.Count();++i)
{ {
const XRCWidgetData& w = m_wdata.Item(i); const XRCWidgetData& w = m_wdata.Item(i);
if( !IsRealClass(w.GetClass()) ) continue; if( !IsRealClass(w.GetClass()) ) continue;
if( w.GetName().Length() == 0 ) continue; if( w.GetName().Length() == 0 ) continue;
file.Write( file.Write(
_T(" ") + w.GetClass() + _T("* ") + w.GetName() _T(" ") + w.GetClass() + _T("* ") + w.GetName()
+ _T(";\n")); + _T(";\n"));
@@ -123,8 +126,8 @@ public:
for(i=0;i<m_wdata.Count();++i) for(i=0;i<m_wdata.Count();++i)
{ {
const XRCWidgetData& w = m_wdata.Item(i); const XRCWidgetData& w = m_wdata.Item(i);
if( !IsRealClass(w.GetClass()) ) continue; if( !IsRealClass(w.GetClass()) ) continue;
if( w.GetName().Length() == 0 ) continue; if( w.GetName().Length() == 0 ) continue;
file.Write( _T(" ") file.Write( _T(" ")
+ w.GetName() + w.GetName()
+ _T(" = XRCCTRL(*this,\"") + _T(" = XRCCTRL(*this,\"")
@@ -134,18 +137,19 @@ public:
+ _T(");\n") + _T(");\n")
); );
} }
file.Write(_T(" }\n")); file.Write(_T(" }\n"));
file.Write( file.Write(
_T("public:\n") _T("public:\n")
+ m_className + m_className
+ _T("::") + _T("::")
+ m_className + m_className
+ _T("(){\n") + _T("(){\n")
+ _T(" InitWidgetsFromXRC();\n") + _T(" InitWidgetsFromXRC();\n")
_T(" }\n") _T(" }\n")
_T("};\n")); _T("};\n")
}; );
};
}; };
WX_DECLARE_OBJARRAY(XRCWndClassData,ArrayOfXRCWndClassData); WX_DECLARE_OBJARRAY(XRCWndClassData,ArrayOfXRCWndClassData);
WX_DEFINE_OBJARRAY(ArrayOfXRCWndClassData); WX_DEFINE_OBJARRAY(ArrayOfXRCWndClassData);
@@ -215,10 +219,6 @@ int XmlResApp::OnRun()
{ {
case -1: case -1:
return 0; return 0;
#if 0
// break is unreachable because of return earlier
break;
#endif
case 0: case 0:
retCode = 0; retCode = 0;
@@ -228,17 +228,6 @@ int XmlResApp::OnRun()
else else
CompileRes(); CompileRes();
return retCode; return retCode;
#if 0
// break is unreachable because of return earlier
break;
#endif
#if 0
// default return moved outside of switch to avoid warning about lack of return in function
default:
return 1;
break;
#endif
} }
return 1; return 1;
} }
@@ -285,7 +274,7 @@ void XmlResApp::ParseParams(const wxCmdLineParser& cmdline)
{ {
#ifdef __WINDOWS__ #ifdef __WINDOWS__
wxString fn=wxFindFirstFile(cmdline.GetParam(i), wxFILE); wxString fn=wxFindFirstFile(cmdline.GetParam(i), wxFILE);
while (!fn.IsEmpty()) while (!fn.empty())
{ {
parFiles.Add(fn); parFiles.Add(fn);
fn=wxFindNextFile(); fn=wxFindNextFile();
@@ -515,7 +504,10 @@ static wxString FileToCppArray(wxString filename, int num)
wxString tmp; wxString tmp;
wxString snum; wxString snum;
wxFFile file(filename, wxT("rb")); wxFFile file(filename, wxT("rb"));
size_t lng = file.Length(); wxFileOffset offset = file.Length();
wxASSERT_MSG( offset >= 0 , wxT("Invalid file length") );
wxASSERT_MSG( offset == wxFileOffset(size_t(offset)) , wxT("Huge file not supported") );
size_t lng = (size_t)offset;
snum.Printf(_T("%i"), num); snum.Printf(_T("%i"), num);
output.Printf(_T("static size_t xml_res_size_") + snum + _T(" = %i;\n"), lng); output.Printf(_T("static size_t xml_res_size_") + snum + _T(" = %i;\n"), lng);
@@ -638,7 +630,10 @@ static wxString FileToPythonArray(wxString filename, int num)
wxString tmp; wxString tmp;
wxString snum; wxString snum;
wxFFile file(filename, wxT("rb")); wxFFile file(filename, wxT("rb"));
size_t lng = file.Length(); wxFileOffset offset = file.Length();
wxASSERT_MSG( offset >= 0 , wxT("Invalid file length") );
wxASSERT_MSG( offset == wxFileOffset(size_t(offset)) , wxT("Huge file not supported") );
size_t lng = (size_t)offset;
snum.Printf(_T("%i"), num); snum.Printf(_T("%i"), num);
output = _T(" xml_res_file_") + snum + _T(" = '''\\\n"); output = _T(" xml_res_file_") + snum + _T(" = '''\\\n");