#ifndef WX_PRECOMP
#include "wx/app.h"
#include "wx/log.h"
+ #include "wx/wxcrtvararg.h"
#endif
#include "wx/cmdline.h"
#include "wx/filename.h"
#include "wx/wfstream.h"
#include "wx/utils.h"
+#include "wx/hashset.h"
+WX_DECLARE_HASH_SET(wxString, wxStringHash, wxStringEqual, StringSet);
class XRCWidgetData
{
private:
wxString m_className;
wxString m_parentClassName;
+ StringSet m_ancestorClassNames;
ArrayOfXRCWidgetData m_wdata;
void BrowseXmlNode(wxXmlNode* node)
}
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)
{
+ if ( className == _T("wxMenu") )
+ {
+ m_ancestorClassNames.insert(_T("wxMenu"));
+ m_ancestorClassNames.insert(_T("wxMenuBar"));
+ }
+ else if ( className == _T("wxMDIChildFrame") )
+ {
+ m_ancestorClassNames.insert(_T("wxMDIParentFrame"));
+ }
+ else if( className == _T("wxMenuBar") ||
+ className == _T("wxStatusBar") ||
+ className == _T("wxToolBar") )
+ {
+ m_ancestorClassNames.insert(_T("wxFrame"));
+ }
+ else
+ {
+ m_ancestorClassNames.insert(_T("wxWindow"));
+ }
+
BrowseXmlNode(node->GetChildren());
}
return m_wdata;
}
- bool IsRealClass(const wxString& name)
+ bool CanBeUsedWithXRCCTRL(const wxString& name)
{
if (name == _T("tool") ||
+ name == _T("data") ||
name == _T("unknown") ||
name == _T("notebookpage") ||
name == _T("separator") ||
name == _T("sizeritem") ||
- name == _T("wxMenuItem"))
+ name == _T("wxMenuBar") ||
+ name == _T("wxMenuItem") ||
+ name == _T("wxStaticBoxSizer") )
{
return false;
}
file.Write(_T("class ") + m_className + _T(" : public ") + m_parentClassName
+ _T(" {\nprotected:\n"));
size_t i;
- for(i=0;i<m_wdata.Count();++i)
+ for(i=0;i<m_wdata.GetCount();++i)
{
const XRCWidgetData& w = m_wdata.Item(i);
- if( !IsRealClass(w.GetClass()) ) continue;
+ if( !CanBeUsedWithXRCCTRL(w.GetClass()) ) continue;
if( w.GetName().Length() == 0 ) continue;
file.Write(
_T(" ") + w.GetClass() + _T("* ") + w.GetName()
+ _T(";\n"));
}
- file.Write(_T("\nprivate:\n void InitWidgetsFromXRC(){\n")
- _T(" wxXmlResource::Get()->LoadObject(this,NULL,_T(\"")
+ file.Write(_T("\nprivate:\n void InitWidgetsFromXRC(wxWindow *parent){\n")
+ _T(" wxXmlResource::Get()->LoadObject(this,parent,_T(\"")
+ m_className
+ _T("\"), _T(\"")
+ m_parentClassName
+ _T("\"));\n"));
- for(i=0;i<m_wdata.Count();++i)
+ for(i=0;i<m_wdata.GetCount();++i)
{
const XRCWidgetData& w = m_wdata.Item(i);
- if( !IsRealClass(w.GetClass()) ) continue;
+ if( !CanBeUsedWithXRCCTRL(w.GetClass()) ) continue;
if( w.GetName().Length() == 0 ) continue;
file.Write( _T(" ")
+ w.GetName()
+ w.GetName()
+ _T("\",")
+ w.GetClass()
- + _T(");\n")
- );
+ + _T(");\n"));
}
file.Write(_T(" }\n"));
- file.Write(
- _T("public:\n")
- + m_className
- + _T("::")
- + m_className
- + _T("(){\n")
- + _T(" InitWidgetsFromXRC();\n")
- _T(" }\n")
- _T("};\n")
- );
- };
+ file.Write( _T("public:\n"));
+
+ if ( m_ancestorClassNames.size() == 1 )
+ {
+ file.Write
+ (
+ m_className +
+ _T("(") +
+ *m_ancestorClassNames.begin() +
+ _T(" *parent=NULL){\n") +
+ _T(" InitWidgetsFromXRC((wxWindow *)parent);\n")
+ _T(" }\n")
+ _T("};\n")
+ );
+ }
+ else
+ {
+ file.Write(m_className + _T("(){\n") +
+ _T(" InitWidgetsFromXRC(NULL);\n")
+ _T(" }\n")
+ _T("};\n"));
+
+ for ( StringSet::const_iterator it = m_ancestorClassNames.begin();
+ it != m_ancestorClassNames.end();
+ ++it )
+ {
+ file.Write(m_className + _T("(") + *it + _T(" *parent){\n") +
+ _T(" InitWidgetsFromXRC((wxWindow *)parent);\n")
+ _T(" }\n")
+ _T("};\n"));
+ }
+ }
+ }
};
WX_DECLARE_OBJARRAY(XRCWndClassData,ArrayOfXRCWndClassData);
WX_DEFINE_OBJARRAY(ArrayOfXRCWndClassData)
{
wxArrayString flist;
- for (size_t i = 0; i < parFiles.Count(); i++)
+ for (size_t i = 0; i < parFiles.GetCount(); i++)
{
if (flagVerbose)
wxPrintf(_T("processing ") + parFiles[i] + _T("...\n"));
// Does 'node' contain filename information at all?
static bool NodeContainsFilename(wxXmlNode *node)
{
- // Any bitmaps:
- if (node->GetName() == _T("bitmap"))
+ const wxString name = node->GetName();
+
+ // Any bitmaps (bitmap2 is used for disabled toolbar buttons):
+ if ( name == _T("bitmap") || name == _T("bitmap2") )
return true;
- if (node->GetName() == _T("icon"))
+ if ( name == _T("icon") )
return true;
// URLs in wxHtmlWindow:
- if (node->GetName() == _T("url"))
+ if ( name == _T("url") )
return true;
// wxBitmapButton:
wxXmlNode *parent = node->GetParent();
if (parent != NULL &&
parent->GetPropVal(_T("class"), _T("")) == _T("wxBitmapButton") &&
- (node->GetName() == _T("focus") ||
- node->GetName() == _T("disabled") ||
- node->GetName() == _T("selected")))
+ (name == _T("focus") ||
+ name == _T("disabled") ||
+ name == _T("selected")))
return true;
// wxBitmap or wxIcon toplevel resources:
- if (node->GetName() == _T("object"))
+ if ( name == _T("object") )
{
wxString klass = node->GetPropVal(_T("class"), wxEmptyString);
- if (klass == _T("wxBitmap") || klass == _T("wxIcon"))
+ if (klass == _T("wxBitmap") ||
+ klass == _T("wxIcon") ||
+ klass == _T("data") )
return true;
}
void XmlResApp::DeleteTempFiles(const wxArrayString& flist)
{
- for (size_t i = 0; i < flist.Count(); i++)
+ for (size_t i = 0; i < flist.GetCount(); i++)
wxRemoveFile(parOutputPath + wxFILE_SEP_PATH + flist[i]);
}
{
wxString files;
- for (size_t i = 0; i < flist.Count(); i++)
+ for (size_t i = 0; i < flist.GetCount(); i++)
files += flist[i] + _T(" ");
files.RemoveLast();
_T("#include <wx/xrc/xh_all.h>\n")
_T("\n"));
- for (i = 0; i < flist.Count(); i++)
+ for (i = 0; i < flist.GetCount(); i++)
file.Write(
FileToCppArray(parOutputPath + wxFILE_SEP_PATH + flist[i], i));
_T(" }\n")
_T("\n"));
- for (i = 0; i < flist.Count(); i++)
+ for (i = 0; i < flist.GetCount(); i++)
{
wxString s;
s.Printf(_T(" wxMemoryFSHandler::AddFile(wxT(\"XRC_resource/") + flist[i] +
file.Write(s);
}
- for (i = 0; i < parFiles.Count(); i++)
+ for (i = 0; i < parFiles.GetCount(); i++)
{
file.Write(_T(" wxXmlResource::Get()->Load(wxT(\"memory:XRC_resource/") +
GetInternalFileName(parFiles[i], flist) + _T("\"));\n"));
_T("#ifndef __") + fileSpec + _T("_h__\n")
_T("#define __") + fileSpec + _T("_h__\n")
);
- for(size_t i=0;i<aXRCWndClassData.Count();++i){
+ for(size_t i=0;i<aXRCWndClassData.GetCount();++i){
aXRCWndClassData.Item(i).GenerateHeaderCode(file);
}
file.Write(
file.Write(_T("def ") + parFuncname + _T("():\n"));
- for (i = 0; i < flist.Count(); i++)
+ for (i = 0; i < flist.GetCount(); i++)
file.Write(
FileToPythonArray(parOutputPath + wxFILE_SEP_PATH + flist[i], i));
);
- for (i = 0; i < flist.Count(); i++)
+ for (i = 0; i < flist.GetCount(); i++)
{
wxString s;
s.Printf(_T(" wx.MemoryFSHandler.AddFile('XRC_resource/") + flist[i] +
_T("', xml_res_file_%i)\n"), i);
file.Write(s);
}
- for (i = 0; i < parFiles.Count(); i++)
+ for (i = 0; i < parFiles.GetCount(); i++)
{
file.Write(_T(" wx.xrc.XmlResource.Get().Load('memory:XRC_resource/") +
GetInternalFileName(parFiles[i], flist) + _T("')\n"));
{
wxArrayString arr, a2;
- for (size_t i = 0; i < parFiles.Count(); i++)
+ for (size_t i = 0; i < parFiles.GetCount(); i++)
{
if (flagVerbose)
wxPrintf(_T("processing ") + parFiles[i] + _T("...\n"));
projects / wxWidgets.git / blobdiff