#include "wx/fontmap.h"
#include "wx/artprov.h"
-#include "wx/xrc/xml.h"
+#include "wx/xml/xml.h"
#include "wx/xrc/xmlres.h"
#include "wx/arrimpl.cpp"
wxXmlResource::wxXmlResource(int flags)
{
- m_handlers.DeleteContents(TRUE);
m_flags = flags;
m_version = -1;
}
{
m_flags = flags;
m_version = -1;
- m_handlers.DeleteContents(TRUE);
Load(filemask);
}
// filename and not URL:
if (wxFileName::FileExists(fnd))
{
- // Make the name absolute filename, because the app may
+ // Make the name absolute filename, because the app may
// change working directory later:
wxFileName fn(fnd);
if (fn.IsRelative())
fn.MakeAbsolute();
fnd = fn.GetFullPath();
}
+#if wxUSE_FILESYSTEM
+ fnd = wxFileSystem::FileNameToURL(fnd);
+#endif
}
-
+
#if wxUSE_FILESYSTEM
if (fnd.Lower().Matches(wxT("*.zip")) ||
fnd.Lower().Matches(wxT("*.xrs")))
}
# undef wxXmlFindFirst
# undef wxXmlFindNext
- return rt;
+ return rt && UpdateResources();
}
+IMPLEMENT_ABSTRACT_CLASS(wxXmlResourceHandler, wxObject)
void wxXmlResource::AddHandler(wxXmlResourceHandler *handler)
{
void wxXmlResource::ClearHandlers()
{
- m_handlers.Clear();
+ WX_CLEAR_LIST(wxList, m_handlers);
}
while (tkn.HasMoreTokens())
{
s = tkn.GetNextToken();
- if (
-#ifdef __WXMSW__
- s == wxString(wxT("win"))
+#ifdef __WINDOWS__
+ if (s == wxT("win")) isok = true;
+#endif
+#if defined(__MAC__) || defined(__APPLE__)
+ if (s == wxT("mac")) isok = true;
#elif defined(__UNIX__)
- s == wxString(wxT("unix"))
-#elif defined(__MAC__)
- s == wxString(wxT("mac"))
-#elif defined(__OS2__)
- s == wxString(wxT("os2"))
-#else
- FALSE
+ if (s == wxT("unix")) isok = true;
+#endif
+#ifdef __OS2__
+ if (s == wxT("os2")) isok = true;
#endif
- ) isok = TRUE;
+
+ if (isok)
+ break;
}
}
-void wxXmlResource::UpdateResources()
+bool wxXmlResource::UpdateResources()
{
+ bool rt = true;
bool modif;
# if wxUSE_FILESYSTEM
wxFSFile *file = NULL;
+ wxUnusedVar(file);
wxFileSystem fsys;
# endif
#if !wxUSE_UNICODE && wxUSE_INTL
if ( (GetFlags() & wxXRC_USE_LOCALE) == 0 )
{
- // In case we are not using wxLocale to translate strings, convert the strings
- // GUI's charset. This must not be done when wxXRC_USE_LOCALE is on, because
- // it could break wxGetTranslation lookup.
+ // In case we are not using wxLocale to translate strings, convert the
+ // strings GUI's charset. This must not be done when wxXRC_USE_LOCALE
+ // is on, because it could break wxGetTranslation lookup.
encoding = wxLocale::GetSystemEncodingName();
}
#endif
file = fsys.OpenFile(m_data[i].File);
modif = file && file->GetModificationTime() > m_data[i].Time;
if (!file)
+ {
wxLogError(_("Cannot open file '%s'."), m_data[i].File.c_str());
+ rt = false;
+ }
wxDELETE(file);
+ wxUnusedVar(file);
# else
modif = wxDateTime(wxFileModificationTime(m_data[i].File)) > m_data[i].Time;
# endif
wxLogError(_("Cannot load resources from file '%s'."),
m_data[i].File.c_str());
wxDELETE(m_data[i].Doc);
+ rt = false;
}
else if (m_data[i].Doc->GetRoot()->GetName() != wxT("resource"))
{
wxLogError(_("Invalid XRC resource '%s': doesn't have root node 'resource'."), m_data[i].File.c_str());
wxDELETE(m_data[i].Doc);
+ rt = false;
}
else
{
if (m_version == -1)
m_version = version;
if (m_version != version)
+ {
wxLogError(_("Resource files must have same version number!"));
+ rt = false;
+ }
ProcessPlatformProperty(m_data[i].Doc->GetRoot());
m_data[i].Time = file->GetModificationTime();
# if wxUSE_FILESYSTEM
wxDELETE(file);
+ wxUnusedVar(file);
# else
wxDELETE(stream);
# endif
}
}
+
+ return rt;
}
wxXmlResourceHandler *handler;
if (handlerToUse)
- {
+ {
if (handlerToUse->CanHandle(node))
{
return handlerToUse->CreateResource(node, parent, instance);
}
}
else if (node->GetName() == wxT("object"))
- {
- wxNode *ND = m_handlers.GetFirst();
+ {
+ wxList::compatibility_iterator ND = m_handlers.GetFirst();
while (ND)
{
handler = (wxXmlResourceHandler*)ND->GetData();
if (!ms_subclassFactories)
{
ms_subclassFactories = new wxXmlSubclassFactoriesList;
- ms_subclassFactories->DeleteContents(TRUE);
}
ms_subclassFactories->Append(factory);
}
wxString subclass = node->GetPropVal(wxT("subclass"), wxEmptyString);
if (!subclass.empty())
{
- for (wxXmlSubclassFactoriesList::Node *i = wxXmlResource::ms_subclassFactories->GetFirst();
+ for (wxXmlSubclassFactoriesList::compatibility_iterator i = wxXmlResource::ms_subclassFactories->GetFirst();
i; i = i->GetNext())
{
m_instance = i->GetData()->Create(subclass);
int wxXmlResourceHandler::GetID()
{
- wxString sid = GetName();
- long num;
-
- if (sid == wxT("-1")) return -1;
- else if (sid.IsNumber() && sid.ToLong(&num)) return num;
-#define stdID(id) else if (sid == wxT(#id)) return id
- stdID(wxID_OPEN); stdID(wxID_CLOSE); stdID(wxID_NEW);
- stdID(wxID_SAVE); stdID(wxID_SAVEAS); stdID(wxID_REVERT);
- stdID(wxID_EXIT); stdID(wxID_UNDO); stdID(wxID_REDO);
- stdID(wxID_HELP); stdID(wxID_PRINT); stdID(wxID_PRINT_SETUP);
- stdID(wxID_PREVIEW); stdID(wxID_ABOUT); stdID(wxID_HELP_CONTENTS);
- stdID(wxID_HELP_COMMANDS); stdID(wxID_HELP_PROCEDURES);
- stdID(wxID_CUT); stdID(wxID_COPY); stdID(wxID_PASTE);
- stdID(wxID_CLEAR); stdID(wxID_FIND); stdID(wxID_DUPLICATE);
- stdID(wxID_SELECTALL); stdID(wxID_OK); stdID(wxID_CANCEL);
- stdID(wxID_APPLY); stdID(wxID_YES); stdID(wxID_NO);
- stdID(wxID_STATIC); stdID(wxID_FORWARD); stdID(wxID_BACKWARD);
- stdID(wxID_DEFAULT); stdID(wxID_MORE); stdID(wxID_SETUP);
- stdID(wxID_RESET); stdID(wxID_HELP_CONTEXT);
- stdID(wxID_CLOSE_ALL);
-#undef stdID
- else return wxXmlResource::GetXRCID(sid);
+ return wxXmlResource::GetXRCID(GetName());
}
wxFSFile *fsfile = GetCurFileSystem().OpenFile(name);
if (fsfile == NULL)
{
- wxLogError(_("XRC resource: Cannot create bitmap from '%s'."), param.c_str());
+ wxLogError(_("XRC resource: Cannot create bitmap from '%s'."),
+ name.c_str());
return wxNullBitmap;
}
wxImage img(*(fsfile->GetStream()));
const wxArtClient& defaultArtClient,
wxSize size)
{
-#if wxCHECK_VERSION(2,3,0) || defined(__WXMSW__)
wxIcon icon;
icon.CopyFromBitmap(GetBitmap(param, defaultArtClient, size));
-#else
- wxIcon *iconpt;
- wxBitmap bmppt = GetBitmap(param, size);
- iconpt = (wxIcon*)(&bmppt);
- wxIcon icon(*iconpt);
-#endif
return icon;
}
static XRCID_record *XRCID_Records[XRCID_TABLE_SIZE] = {NULL};
-/*static*/ int wxXmlResource::GetXRCID(const wxChar *str_id)
+static int XRCID_Lookup(const wxChar *str_id, int value_if_not_found = -2)
{
static int XRCID_LastID = wxID_HIGHEST;
index %= XRCID_TABLE_SIZE;
XRCID_record *oldrec = NULL;
- int matchcnt = 0;
for (XRCID_record *rec = XRCID_Records[index]; rec; rec = rec->next)
{
if (wxStrcmp(rec->key, str_id) == 0)
{
return rec->id;
}
- matchcnt++;
oldrec = rec;
}
(*rec_var)->next = NULL;
wxChar *end;
- int asint = wxStrtol(str_id, &end, 10);
- if (*str_id && *end == 0)
- {
- // if str_id was integer, keep it verbosely:
- (*rec_var)->id = asint;
- }
+ if (value_if_not_found != -2)
+ (*rec_var)->id = value_if_not_found;
else
{
- (*rec_var)->id = ++XRCID_LastID;
+ int asint = wxStrtol(str_id, &end, 10);
+ if (*str_id && *end == 0)
+ {
+ // if str_id was integer, keep it verbosely:
+ (*rec_var)->id = asint;
+ }
+ else
+ {
+ (*rec_var)->id = ++XRCID_LastID;
+ }
}
return (*rec_var)->id;
}
+/*static*/ int wxXmlResource::GetXRCID(const wxChar *str_id)
+{
+ return XRCID_Lookup(str_id);
+}
+
static void CleanXRCID_Record(XRCID_record *rec)
{
static void CleanXRCID_Records()
{
for (int i = 0; i < XRCID_TABLE_SIZE; i++)
+ {
CleanXRCID_Record(XRCID_Records[i]);
+ XRCID_Records[i] = NULL;
+ }
}
-
-
+static void AddStdXRCID_Records()
+{
+#define stdID(id) XRCID_Lookup(wxT(#id), id)
+ stdID(-1);
+ stdID(wxID_OPEN); stdID(wxID_CLOSE); stdID(wxID_NEW);
+ stdID(wxID_SAVE); stdID(wxID_SAVEAS); stdID(wxID_REVERT);
+ stdID(wxID_EXIT); stdID(wxID_UNDO); stdID(wxID_REDO);
+ stdID(wxID_HELP); stdID(wxID_PRINT); stdID(wxID_PRINT_SETUP);
+ stdID(wxID_PREVIEW); stdID(wxID_ABOUT); stdID(wxID_HELP_CONTENTS);
+ stdID(wxID_HELP_COMMANDS); stdID(wxID_HELP_PROCEDURES);
+ stdID(wxID_CUT); stdID(wxID_COPY); stdID(wxID_PASTE);
+ stdID(wxID_CLEAR); stdID(wxID_FIND); stdID(wxID_DUPLICATE);
+ stdID(wxID_SELECTALL); stdID(wxID_OK); stdID(wxID_CANCEL);
+ stdID(wxID_APPLY); stdID(wxID_YES); stdID(wxID_NO);
+ stdID(wxID_STATIC); stdID(wxID_FORWARD); stdID(wxID_BACKWARD);
+ stdID(wxID_DEFAULT); stdID(wxID_MORE); stdID(wxID_SETUP);
+ stdID(wxID_RESET); stdID(wxID_HELP_CONTEXT);
+ stdID(wxID_CLOSE_ALL);
+#undef stdID
+}
wxXmlResourceModule() {}
bool OnInit()
{
+ AddStdXRCID_Records();
wxXmlResource::AddSubclassFactory(new wxXmlSubclassFactoryCXX);
return TRUE;
}
void OnExit()
{
delete wxXmlResource::Set(NULL);
+ if(wxXmlResource::ms_subclassFactories)
+ WX_CLEAR_LIST(wxXmlSubclassFactoriesList, *wxXmlResource::ms_subclassFactories);
wxDELETE(wxXmlResource::ms_subclassFactories);
CleanXRCID_Records();
}
module->Init();
wxModule::RegisterModule(module);
}
-
-
projects / wxWidgets.git / blobdiff