#include "wx/intl.h"
#include "wx/tokenzr.h"
#include "wx/module.h"
+#include "wx/bitmap.h"
+#include "wx/image.h"
#include "wx/xml/xml.h"
#include "wx/xml/xmlres.h"
m_Handlers.DeleteContents(TRUE);
}
-wxXmlResource::wxXmlResource(const wxString& filemask, int type)
+wxXmlResource::wxXmlResource(const wxString& filemask)
{
m_Handlers.DeleteContents(TRUE);
- Load(filemask, type);
+ Load(filemask);
}
wxXmlResource::~wxXmlResource()
}
-bool wxXmlResource::Load(const wxString& filemask, int type)
+bool wxXmlResource::Load(const wxString& filemask)
{
wxString fnd;
wxXmlResourceDataRecord *drec;
+ bool iswild = wxIsWild(filemask);
#if wxUSE_FILESYSTEM
wxFileSystem fsys;
#else
# define wxXmlFindFirst wxFindFirstFile(filemask, wxFILE)
# define wxXmlFindNext wxFindNextFile()
- wxASSERT_MSG(type != wxXML_ARCHIVE, wxT("ZIP archive XML resources supported only with wxUSE_FILESYSTEM set to 1!"));
#endif
- fnd = wxXmlFindFirst;
+ if (iswild)
+ fnd = wxXmlFindFirst;
+ else
+ fnd = filemask;
while (!!fnd)
{
#if wxUSE_FILESYSTEM
- if (type == wxXML_ARCHIVE)
+ if (filemask.Lower().Matches("*.zip") ||
+ filemask.Lower().Matches("*.rsc"))
{
wxFileSystem fs2;
wxString fnd2;
drec->File = fnd;
m_Data.Add(drec);
}
- fnd = wxXmlFindNext;
+
+ if (iswild)
+ fnd = wxXmlFindNext;
+ else
+ fnd = wxEmptyString;
}
# undef wxXmlFindFirst
# undef wxXmlFindNext
+wxToolBar *wxXmlResource::LoadToolBar(wxWindow *parent, const wxString& name)
+{
+ return (wxToolBar*)CreateResFromNode(FindResource(name, wxT("toolbar")), parent, NULL);
+}
+
+
+
wxDialog *wxXmlResource::LoadDialog(wxWindow *parent, const wxString& name)
{
wxDialog *dialog = new wxDialog;
+void wxXmlResource::ProcessPlatformProperty(wxXmlNode *node)
+{
+ wxString s;
+ bool isok;
+
+ wxXmlNode *c = node->GetChildren();
+ while (c)
+ {
+ isok = FALSE;
+ if (!c->GetPropVal(_T("platform"), &s))
+ isok = TRUE;
+ else
+ {
+ wxStringTokenizer tkn(s, " |");
+
+ while (tkn.HasMoreTokens())
+ {
+ s = tkn.GetNextToken();
+ if (
+#ifdef __WXMSW__
+ s == wxString(_T("win"))
+#elif defined(__UNIX__)
+ s == wxString(_T("unix"))
+#elif defined(__MAC__)
+ s == wxString(_T("mac"))
+#elif defined(__OS2__)
+ s == wxString(_T("os2"))
+#else
+ FALSE
+#endif
+ ) isok = TRUE;
+ }
+ }
+
+ if (isok)
+ ProcessPlatformProperty(c);
+ else
+ {
+ node->RemoveChild(c);
+ delete c;
+ }
+
+ c = c->GetNext();
+ }
+}
+
+
+
void wxXmlResource::UpdateResources()
{
bool modif;
m_Data[i].Doc = new wxXmlDocument;
}
if (!stream || !m_Data[i].Doc->Load(*stream))
+ {
wxLogError(_("Cannot load resources from file '%s'."), m_Data[i].File.c_str());
-
- if (m_Data[i].Doc->GetRoot()->GetName() != _T("resource"))
+ delete m_Data[i].Doc;
+ m_Data[i].Doc = NULL;
+ }
+ else if (m_Data[i].Doc->GetRoot()->GetName() != _T("resource"))
+ {
wxLogError(_("Invalid XML resource '%s': doesn't have root node 'resource'."), m_Data[i].File.c_str());
+ delete m_Data[i].Doc;
+ m_Data[i].Doc = NULL;
+ }
+ else
+ ProcessPlatformProperty(m_Data[i].Doc->GetRoot());
# if wxUSE_FILESYSTEM
delete file;
wxString dummy;
for (size_t f = 0; f < m_Data.GetCount(); f++)
{
+ if (m_Data[f].Doc == NULL || m_Data[f].Doc->GetRoot() == NULL) continue;
for (wxXmlNode *node = m_Data[f].Doc->GetRoot()->GetChildren();
node; node = node->GetNext())
if ( node->GetType() == wxXML_ELEMENT_NODE &&
(!type || node->GetName() == type) &&
node->GetPropVal(wxT("name"), &dummy) &&
- dummy == name &&
- wxXmlResourceHandler::CheckPlatform(node))
+ dummy == name)
+ {
+#if wxUSE_FILESYSTEM
+ m_CurFileSystem.ChangePathTo(m_Data[f].File);
+#endif
return node;
+ }
}
wxLogError(_("XML resource '%s' (type '%s') not found!"),
wxObject *wxXmlResourceHandler::CreateResource(wxXmlNode *node, wxObject *parent, wxObject *instance)
{
- if (!CheckPlatform(node)) return NULL;
-
wxXmlNode *myNode = m_Node;
wxObject *myParent = m_Parent, *myInstance = m_Instance;
wxWindow *myParentAW = m_ParentAsWindow, *myInstanceAW = m_InstanceAsWindow;
}
-
-/*static*/ bool wxXmlResourceHandler::CheckPlatform(wxXmlNode *node)
+void wxXmlResourceHandler::AddStyle(const wxString& name, int value)
{
- wxString s;
- if (!node->GetPropVal(_T("platform"), &s)) return TRUE;
-#ifdef __WXMSW__
- return s == wxString(_T("win"));
-#elif defined(__UNIX__)
- return s == wxString(_T("unix"));
-#elif defined(__MAC__)
- return s == wxString(_T("mac"));
-#elif defined(__OS2__)
- return s == wxString(_T("os2"));
-#else
- wxLogWarning(_("You're running the application on unknown platform, check for platfrom '%s' failed."), s.mb_str());
- return TRUE; // unknown platform
-#endif
+ m_StyleNames.Add(name);
+ m_StyleValues.Add(value);
}
-void wxXmlResourceHandler::AddStyle(const wxString& name, int value)
+
+void wxXmlResourceHandler::AddWindowStyles()
{
- m_StyleNames.Add(name);
- m_StyleValues.Add(value);
+ ADD_STYLE(wxSIMPLE_BORDER);
+ ADD_STYLE(wxSUNKEN_BORDER);
+ ADD_STYLE(wxDOUBLE_BORDER);
+ ADD_STYLE(wxRAISED_BORDER);
+ ADD_STYLE(wxSTATIC_BORDER);
+ ADD_STYLE(wxTRANSPARENT_WINDOW);
+ ADD_STYLE(wxWANTS_CHARS);
+ ADD_STYLE(wxNO_FULL_REPAINT_ON_RESIZE);
}
+
bool wxXmlResourceHandler::HasParam(const wxString& param)
{
return (GetParamNode(param) != NULL);
}
+
+wxBitmap wxXmlResourceHandler::GetBitmap(const wxString& param, wxSize size)
+{
+ wxString name = GetParamValue(param);
+ if (name.IsEmpty()) return wxNullBitmap;
+#if wxUSE_FILESYSTEM
+ wxFSFile *fsfile = GetCurFileSystem().OpenFile(name);
+ if (fsfile == NULL)
+ {
+ wxLogError(_("XML resource: Cannot create bitmap from '%s'."), param.mb_str());
+ return wxNullBitmap;
+ }
+ wxImage img(*(fsfile->GetStream()));
+ delete fsfile;
+#else
+ wxImage img(GetParamValue(_T("bitmap")));
+#endif
+ if (!img.Ok())
+ {
+ wxLogError(_("XML resource: Cannot create bitmap from '%s'."), param.mb_str());
+ return wxNullBitmap;
+ }
+ if (!(size == wxDefaultSize)) img.Rescale(size.x, size.y);
+ return img.ConvertToBitmap();
+}
+
+
+
+wxIcon wxXmlResourceHandler::GetIcon(const wxString& param, wxSize size)
+{
+#if wxCHECK_VERSION(2,3,0) || defined(__WXMSW__)
+ wxIcon icon;
+ icon.CopyFromBitmap(GetBitmap(param, size));
+#else
+ wxIcon *iconpt;
+ wxBitmap bmppt = GetBitmap(param, size);
+ iconpt = (wxIcon*)(&bmppt);
+ wxIcon icon(*iconpt);
+#endif
+ return icon;
+}
+
+
+
wxXmlNode *wxXmlResourceHandler::GetParamNode(const wxString& param)
{
wxXmlNode *n = m_Node->GetChildren();
wxSize wxXmlResourceHandler::GetSize(const wxString& param)
{
wxString s = GetParamValue(param);
- if (!s) s = _T("-1,-1");
+ if (s.IsEmpty()) s = _T("-1,-1");
bool is_dlg;
long sx, sy;
+wxCoord wxXmlResourceHandler::GetDimension(const wxString& param, wxCoord defaultv)
+{
+ wxString s = GetParamValue(param);
+ if (s.IsEmpty()) return defaultv;
+ bool is_dlg;
+ long sx;
+
+ is_dlg = s[s.Length()-1] == _T('d');
+ if (is_dlg) s.RemoveLast();
+
+ if (!s.ToLong(&sx))
+ {
+ wxLogError(_("Cannot parse dimension from '%s'."), s.mb_str());
+ return defaultv;
+ }
+
+ if (is_dlg)
+ {
+ if (m_InstanceAsWindow)
+ return wxDLG_UNIT(m_InstanceAsWindow, wxSize(sx, 0)).x;
+ else if (m_ParentAsWindow)
+ return wxDLG_UNIT(m_ParentAsWindow, wxSize(sx, 0)).x;
+ else
+ {
+ wxLogError(_("Cannot convert dialog units: dialog unknown."));
+ return defaultv;
+ }
+ }
+ else return sx;
+}
+
+
+
void wxXmlResourceHandler::SetupWindow(wxWindow *wnd)
{
//FIXME : add font, cursor
{
if (children_node == NULL) children_node = GetParamNode(_T("children"));
if (children_node == NULL) return;
-
+
wxXmlNode *n = children_node->GetChildren();
-
+
while (n)
{
if (n->GetType() == wxXML_ELEMENT_NODE)
// --------------- XMLID implementation -----------------------------
-
#define XMLID_TABLE_SIZE 1024
+
struct XMLID_record
{
int id;
- const char *key;
+ char *key;
XMLID_record *next;
};
index %= XMLID_TABLE_SIZE;
XMLID_record *oldrec = NULL;
+ int matchcnt = 0;
for (XMLID_record *rec = XMLID_Records[index]; rec; rec = rec->next)
{
- if (strcmp(rec->key, str_id) == 0) return rec->id;
+ if (strcmp(rec->key, str_id) == 0)
+ {
+ return rec->id;
+ }
+ matchcnt++;
oldrec = rec;
}
&XMLID_Records[index] : &oldrec->next;
*rec_var = new XMLID_record;
(*rec_var)->id = ++XMLID_LastID;
- (*rec_var)->key = str_id;
+ (*rec_var)->key = strdup(str_id);
(*rec_var)->next = NULL;
return (*rec_var)->id;
if (rec)
{
CleanXMLID_Record(rec->next);
+ free (rec->key);
delete rec;
}
}
projects / wxWidgets.git / blobdiff