X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/29b5f2cc190cbea87e4d0e43c35cab5d03315ca0..b008b592cce934305dfa2eaaae0cd824b0d1e1cb:/contrib/src/xml/xmlres.cpp?ds=sidebyside diff --git a/contrib/src/xml/xmlres.cpp b/contrib/src/xml/xmlres.cpp index 0318204747..3245347129 100644 --- a/contrib/src/xml/xmlres.cpp +++ b/contrib/src/xml/xmlres.cpp @@ -27,6 +27,8 @@ #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" @@ -40,10 +42,10 @@ wxXmlResource::wxXmlResource() 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() @@ -52,10 +54,11 @@ 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; @@ -64,13 +67,16 @@ bool wxXmlResource::Load(const wxString& filemask, int type) #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; @@ -91,7 +97,11 @@ bool wxXmlResource::Load(const wxString& filemask, int type) drec->File = fnd; m_Data.Add(drec); } - fnd = wxXmlFindNext; + + if (iswild) + fnd = wxXmlFindNext; + else + fnd = wxEmptyString; } # undef wxXmlFindFirst # undef wxXmlFindNext @@ -129,6 +139,13 @@ wxMenuBar *wxXmlResource::LoadMenuBar(const wxString& name) +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; @@ -249,12 +266,19 @@ void wxXmlResource::UpdateResources() 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()); - - ProcessPlatformProperty(m_Data[i].Doc->GetRoot()); + delete m_Data[i].Doc; + m_Data[i].Doc = NULL; + } + else + ProcessPlatformProperty(m_Data[i].Doc->GetRoot()); # if wxUSE_FILESYSTEM delete file; @@ -274,13 +298,19 @@ wxXmlNode *wxXmlResource::FindResource(const wxString& name, const wxString& typ 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) + { +#if wxUSE_FILESYSTEM + m_CurFileSystem.ChangePathTo(m_Data[f].File); +#endif return node; + } } wxLogError(_("XML resource '%s' (type '%s') not found!"), @@ -356,6 +386,21 @@ void wxXmlResourceHandler::AddStyle(const wxString& name, int value) } + +void wxXmlResourceHandler::AddWindowStyles() +{ + 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); @@ -492,6 +537,50 @@ wxColour wxXmlResourceHandler::GetColour(const wxString& param) } + +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(); @@ -573,6 +662,39 @@ wxPoint wxXmlResourceHandler::GetPosition(const wxString& param) +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 @@ -601,9 +723,9 @@ void wxXmlResourceHandler::CreateChildren(wxObject *parent, { 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) @@ -630,7 +752,6 @@ void wxXmlResourceHandler::CreateChildren(wxObject *parent, // --------------- XMLID implementation ----------------------------- - #define XMLID_TABLE_SIZE 1024 @@ -657,9 +778,6 @@ static int XMLID_LastID = wxID_HIGHEST; { if (strcmp(rec->key, str_id) == 0) { -#ifdef DEBUG_XMLID_HASH - printf("XMLID: matched '%s' (%ith item)\n", rec->key, matchcnt); -#endif return rec->id; } matchcnt++; @@ -672,10 +790,6 @@ static int XMLID_LastID = wxID_HIGHEST; (*rec_var)->id = ++XMLID_LastID; (*rec_var)->key = strdup(str_id); (*rec_var)->next = NULL; -#ifdef DEBUG_XMLID_HASH - printf("XMLID: new key for '%s': %i at %i (%ith item)\n", - (*rec_var)->key, (*rec_var)->id, index, matchcnt); -#endif return (*rec_var)->id; } @@ -685,9 +799,6 @@ static void CleanXMLID_Record(XMLID_record *rec) { if (rec) { -#ifdef DEBUG_XMLID_HASH - printf("XMLID: clearing '%s'\n", rec->key); -#endif CleanXMLID_Record(rec->next); free (rec->key); delete rec;