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

fixes for C++ code generator (modified patch 1010058)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28867 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-08-23 12:55:16 +00:00
parent 35bbb0c66b
commit 76ee049789
2 changed files with 48 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
contrib/utils/wxrc/wxrc.cpp
View File

@@ -86,13 +86,30 @@ public:
const ArrayOfXRCWidgetData& GetWidgetData(){ const ArrayOfXRCWidgetData& GetWidgetData(){
return m_wdata; return m_wdata;
} }
void GenerateHeaderCode(wxFFile& file){
bool IsRealClass(const wxString& name)
{
if (name == _T("tool") || name == _T("unknown") ||
name == _T("notebookpage") || name == _T("separator") ||
name == _T("sizeritem") ||
name == _T("wxMenuItem"))
{
return false;
}
return true;
}
void GenerateHeaderCode(wxFFile& file)
{
file.Write(_T("class ") + m_className + _T(" : public ") + m_parentClassName file.Write(_T("class ") + m_className + _T(" : public ") + m_parentClassName
+ _T(" {\nprotected:\n")); + _T(" {\nprotected:\n"));
size_t i; size_t i;
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( 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"));
@@ -103,8 +120,11 @@ public:
+ _T("\",\"") + _T("\",\"")
+ m_parentClassName + m_parentClassName
+ _T("\");\n")); + _T("\");\n"));
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( w.GetName().Length() == 0 ) continue;
file.Write( _T(" ") file.Write( _T(" ")
+ w.GetName() + w.GetName()
+ _T(" = XRCCTRL(*this,\"") + _T(" = XRCCTRL(*this,\"")
@@ -592,7 +612,7 @@ _T("\n"));
void XmlResApp::GenCPPHeader() void XmlResApp::GenCPPHeader()
{ {
wxString fileSpec = (parOutput.BeforeLast('.')).AfterLast('/'); wxString fileSpec = ((parOutput.BeforeLast('.')).AfterLast('/')).AfterLast('\\');
wxString heaFileName = fileSpec + _T(".h"); wxString heaFileName = fileSpec + _T(".h");
wxFFile file(heaFileName, wxT("wt")); wxFFile file(heaFileName, wxT("wt"));

28
utils/wxrc/wxrc.cpp
View File

@@ -86,13 +86,30 @@ public:
const ArrayOfXRCWidgetData& GetWidgetData(){ const ArrayOfXRCWidgetData& GetWidgetData(){
return m_wdata; return m_wdata;
} }
void GenerateHeaderCode(wxFFile& file){
bool IsRealClass(const wxString& name)
{
if (name == _T("tool") || name == _T("unknown") ||
name == _T("notebookpage") || name == _T("separator") ||
name == _T("sizeritem") ||
name == _T("wxMenuItem"))
{
return false;
}
return true;
}
void GenerateHeaderCode(wxFFile& file)
{
file.Write(_T("class ") + m_className + _T(" : public ") + m_parentClassName file.Write(_T("class ") + m_className + _T(" : public ") + m_parentClassName
+ _T(" {\nprotected:\n")); + _T(" {\nprotected:\n"));
size_t i; size_t i;
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( 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"));
@@ -103,8 +120,11 @@ public:
+ _T("\",\"") + _T("\",\"")
+ m_parentClassName + m_parentClassName
+ _T("\");\n")); + _T("\");\n"));
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( w.GetName().Length() == 0 ) continue;
file.Write( _T(" ") file.Write( _T(" ")
+ w.GetName() + w.GetName()
+ _T(" = XRCCTRL(*this,\"") + _T(" = XRCCTRL(*this,\"")
@@ -592,7 +612,7 @@ _T("\n"));
void XmlResApp::GenCPPHeader() void XmlResApp::GenCPPHeader()
{ {
wxString fileSpec = (parOutput.BeforeLast('.')).AfterLast('/'); wxString fileSpec = ((parOutput.BeforeLast('.')).AfterLast('/')).AfterLast('\\');
wxString heaFileName = fileSpec + _T(".h"); wxString heaFileName = fileSpec + _T(".h");
wxFFile file(heaFileName, wxT("wt")); wxFFile file(heaFileName, wxT("wt"));