#include <locale.h>
#endif
+#include "wx/vector.h"
#include "wx/wfstream.h"
#include "wx/filesys.h"
#include "wx/filename.h"
#include "wx/xml/xml.h"
-#include "wx/arrimpl.cpp"
-WX_DEFINE_OBJARRAY(wxXmlResourceDataRecords)
+
+class wxXmlResourceDataRecord
+{
+public:
+ wxXmlResourceDataRecord() : Doc(NULL) {
+#if wxUSE_DATETIME
+ Time = wxDateTime::Now();
+#endif
+ }
+ ~wxXmlResourceDataRecord() {delete Doc;}
+
+ wxString File;
+ wxXmlDocument *Doc;
+#if wxUSE_DATETIME
+ wxDateTime Time;
+#endif
+};
+
+class wxXmlResourceDataRecords : public wxVector<wxXmlResourceDataRecord*>
+{
+ // this is a class so that it can be forward-declared
+};
wxXmlResource *wxXmlResource::ms_instance = NULL;
{
m_flags = flags;
m_version = -1;
+ m_data = new wxXmlResourceDataRecords;
SetDomain(domain);
}
{
m_flags = flags;
m_version = -1;
+ m_data = new wxXmlResourceDataRecords;
SetDomain(domain);
Load(filemask);
}
wxXmlResource::~wxXmlResource()
{
ClearHandlers();
+
+ for ( wxXmlResourceDataRecords::iterator i = m_data->begin();
+ i != m_data->end(); ++i )
+ {
+ delete *i;
+ }
+ delete m_data;
}
void wxXmlResource::SetDomain(const wxString& domain)
bool wxXmlResource::Load(const wxString& filemask)
{
wxString fnd;
- wxXmlResourceDataRecord *drec;
bool iswild = wxIsWild(filemask);
bool rt = true;
else // a single resource URL
#endif // wxUSE_FILESYSTEM
{
- drec = new wxXmlResourceDataRecord;
+ wxXmlResourceDataRecord *drec = new wxXmlResourceDataRecord;
drec->File = fnd;
- m_data.Add(drec);
+ Data().push_back(drec);
}
if (iswild)
#endif // wxUSE_FILESYSTEM
bool unloaded = false;
- const size_t count = m_data.GetCount();
- for ( size_t i = 0; i < count; i++ )
+ for ( wxXmlResourceDataRecords::iterator i = Data().begin();
+ i != Data().end(); ++i )
{
#if wxUSE_FILESYSTEM
if ( isArchive )
{
- if ( m_data[i].File.StartsWith(fnd) )
+ if ( (*i)->File.StartsWith(fnd) )
unloaded = true;
// don't break from the loop, we can have other matching files
}
else // a single resource URL
#endif // wxUSE_FILESYSTEM
{
- if ( m_data[i].File == fnd )
+ if ( (*i)->File == fnd )
{
- m_data.RemoveAt(i);
+ delete *i;
+ Data().erase(i);
unloaded = true;
// no sense in continuing, there is only one file with this URL
void wxXmlResource::AddHandler(wxXmlResourceHandler *handler)
{
- m_handlers.Append(handler);
+ m_handlers.push_back(handler);
handler->SetParentResource(this);
}
void wxXmlResource::InsertHandler(wxXmlResourceHandler *handler)
{
- m_handlers.Insert(handler);
+ m_handlers.insert(m_handlers.begin(), handler);
handler->SetParentResource(this);
}
void wxXmlResource::ClearHandlers()
{
- WX_CLEAR_LIST(wxList, m_handlers);
+ for ( wxVector<wxXmlResourceHandler*>::iterator i = m_handlers.begin();
+ i != m_handlers.end(); ++i )
+ delete *i;
+ m_handlers.clear();
}
}
#endif
- for (size_t i = 0; i < m_data.GetCount(); i++)
+ for ( wxXmlResourceDataRecords::iterator i = Data().begin();
+ i != Data().end(); ++i )
{
- modif = (m_data[i].Doc == NULL);
+ wxXmlResourceDataRecord* const rec = *i;
+
+ modif = (rec->Doc == NULL);
if (!modif && !(m_flags & wxXRC_NO_RELOADING))
{
# if wxUSE_FILESYSTEM
- file = fsys.OpenFile(m_data[i].File);
+ file = fsys.OpenFile(rec->File);
# if wxUSE_DATETIME
- modif = file && file->GetModificationTime() > m_data[i].Time;
+ modif = file && file->GetModificationTime() > rec->Time;
# else // wxUSE_DATETIME
modif = true;
# endif // wxUSE_DATETIME
if (!file)
{
- wxLogError(_("Cannot open file '%s'."), m_data[i].File.c_str());
+ wxLogError(_("Cannot open file '%s'."), rec->File);
rt = false;
}
wxDELETE(file);
wxUnusedVar(file);
# else // wxUSE_FILESYSTEM
# if wxUSE_DATETIME
- modif = wxDateTime(wxFileModificationTime(m_data[i].File)) > m_data[i].Time;
+ modif = wxDateTime(wxFileModificationTime(rec->File)) > rec->Time;
# else // wxUSE_DATETIME
modif = true;
# endif // wxUSE_DATETIME
if (modif)
{
- wxLogTrace(_T("xrc"),
- _T("opening file '%s'"), m_data[i].File.c_str());
+ wxLogTrace(_T("xrc"), _T("opening file '%s'"), rec->File);
wxInputStream *stream = NULL;
# if wxUSE_FILESYSTEM
- file = fsys.OpenFile(m_data[i].File);
+ file = fsys.OpenFile(rec->File);
if (file)
stream = file->GetStream();
# else
- stream = new wxFileInputStream(m_data[i].File);
+ stream = new wxFileInputStream(rec->File);
# endif
if (stream)
{
- delete m_data[i].Doc;
- m_data[i].Doc = new wxXmlDocument;
+ delete rec->Doc;
+ rec->Doc = new wxXmlDocument;
}
- if (!stream || !m_data[i].Doc->Load(*stream, encoding))
+ if (!stream || !rec->Doc->Load(*stream, encoding))
{
wxLogError(_("Cannot load resources from file '%s'."),
- m_data[i].File.c_str());
- wxDELETE(m_data[i].Doc);
+ rec->File);
+ wxDELETE(rec->Doc);
rt = false;
}
- else if (m_data[i].Doc->GetRoot()->GetName() != wxT("resource"))
+ else if (rec->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);
+ wxLogError(_("Invalid XRC resource '%s': doesn't have root node 'resource'."), rec->File);
+ wxDELETE(rec->Doc);
rt = false;
}
else
{
long version;
int v1, v2, v3, v4;
- wxString verstr = m_data[i].Doc->GetRoot()->GetAttribute(
+ wxString verstr = rec->Doc->GetRoot()->GetAttribute(
wxT("version"), wxT("0.0.0.0"));
if (wxSscanf(verstr.c_str(), wxT("%i.%i.%i.%i"),
&v1, &v2, &v3, &v4) == 4)
rt = false;
}
- ProcessPlatformProperty(m_data[i].Doc->GetRoot());
+ ProcessPlatformProperty(rec->Doc->GetRoot());
#if wxUSE_DATETIME
#if wxUSE_FILESYSTEM
- m_data[i].Time = file->GetModificationTime();
+ rec->Time = file->GetModificationTime();
#else // wxUSE_FILESYSTEM
- m_data[i].Time = wxDateTime(wxFileModificationTime(m_data[i].File));
+ rec->Time = wxDateTime(wxFileModificationTime(rec->File));
#endif // wxUSE_FILESYSTEM
#endif // wxUSE_DATETIME
}
UpdateResources(); //ensure everything is up-to-date
wxString dummy;
- for (size_t f = 0; f < m_data.GetCount(); f++)
+ for ( wxXmlResourceDataRecords::const_iterator f = Data().begin();
+ f != Data().end(); ++f )
{
- if ( m_data[f].Doc == NULL || m_data[f].Doc->GetRoot() == NULL )
+ wxXmlResourceDataRecord* const rec = *f;
+ if ( rec->Doc == NULL || rec->Doc->GetRoot() == NULL )
continue;
- wxXmlNode* found = DoFindResource(m_data[f].Doc->GetRoot(),
+ wxXmlNode* found = DoFindResource(rec->Doc->GetRoot(),
name, classname, recursive);
if ( found )
{
#if wxUSE_FILESYSTEM
- m_curFileSystem.ChangePathTo(m_data[f].File);
+ m_curFileSystem.ChangePathTo(rec->File);
#endif
return found;
}
return CreateResFromNode(©, parent, instance);
}
- wxXmlResourceHandler *handler;
-
if (handlerToUse)
{
if (handlerToUse->CanHandle(node))
}
else if (node->GetName() == wxT("object"))
{
- wxList::compatibility_iterator ND = m_handlers.GetFirst();
- while (ND)
+ for ( wxVector<wxXmlResourceHandler*>::iterator h = m_handlers.begin();
+ h != m_handlers.end(); ++h )
{
- handler = (wxXmlResourceHandler*)ND->GetData();
+ wxXmlResourceHandler *handler = *h;
if (handler->CanHandle(node))
- {
return handler->CreateResource(node, parent, instance);
- }
- ND = ND->GetNext();
}
}
}
-#include "wx/listimpl.cpp"
-WX_DECLARE_LIST(wxXmlSubclassFactory, wxXmlSubclassFactoriesList);
-WX_DEFINE_LIST(wxXmlSubclassFactoriesList)
+class wxXmlSubclassFactories : public wxVector<wxXmlSubclassFactory*>
+{
+ // this is a class so that it can be forward-declared
+};
-wxXmlSubclassFactoriesList *wxXmlResource::ms_subclassFactories = NULL;
+wxXmlSubclassFactories *wxXmlResource::ms_subclassFactories = NULL;
/*static*/ void wxXmlResource::AddSubclassFactory(wxXmlSubclassFactory *factory)
{
if (!ms_subclassFactories)
{
- ms_subclassFactories = new wxXmlSubclassFactoriesList;
+ ms_subclassFactories = new wxXmlSubclassFactories;
}
- ms_subclassFactories->Append(factory);
+ ms_subclassFactories->push_back(factory);
}
class wxXmlSubclassFactoryCXX : public wxXmlSubclassFactory
wxString subclass = node->GetAttribute(wxT("subclass"), wxEmptyString);
if (!subclass.empty())
{
- for (wxXmlSubclassFactoriesList::compatibility_iterator i = wxXmlResource::ms_subclassFactories->GetFirst();
- i; i = i->GetNext())
+ for (wxXmlSubclassFactories::iterator i = wxXmlResource::ms_subclassFactories->begin();
+ i != wxXmlResource::ms_subclassFactories->end(); ++i)
{
- m_instance = i->GetData()->Create(subclass);
+ m_instance = (*i)->Create(subclass);
if (m_instance)
break;
}
#else
// The string is internally stored as UTF-8, we have to convert
// it into system's default encoding so that it can be displayed:
- return wxString(str2.mb_str(wxConvUTF8), wxConvLocal);
+ return wxString(str2.wc_str(wxConvUTF8), wxConvLocal);
#endif
}
}
float wxXmlResourceHandler::GetFloat(const wxString& param, float defaultv)
{
- double value;
- wxString str1 = GetParamValue(param);
+ wxString str = GetParamValue(param);
-#ifndef __WXWINCE__
- const char *prevlocale = setlocale(LC_NUMERIC, "C");
-#endif
+ // strings in XRC always use C locale but wxString::ToDouble() uses the
+ // current one, so transform the string to it supposing that the only
+ // difference between them is the decimal separator
+ //
+ // TODO: use wxString::ToCDouble() when we have it
+ str.Replace(wxT("."), wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT,
+ wxLOCALE_CAT_NUMBER));
- if (!str1.ToDouble(&value))
+ double value;
+ if (!str.ToDouble(&value))
value = defaultv;
-#ifndef __WXWINCE__
- setlocale(LC_NUMERIC, prevlocale);
-#endif
-
return wx_truncate_cast(float, value);
}
struct XRCID_record
{
- int id;
+ /* Hold the id so that once an id is allocated for a name, it
+ does not get created again by NewControlId at least
+ until we are done with it */
+ wxWindowIDRef id;
char *key;
XRCID_record *next;
};
}
else
{
- (*rec_var)->id = wxNewId();
+ (*rec_var)->id = wxWindowBase::NewControlId();
}
}
if (rec)
{
CleanXRCID_Record(rec->next);
+
free(rec->key);
delete rec;
}
stdID(wxID_HELP_CONTEXT);
stdID(wxID_CLOSE_ALL);
stdID(wxID_PREFERENCES);
+ stdID(wxID_EDIT);
stdID(wxID_CUT);
stdID(wxID_COPY);
stdID(wxID_PASTE);
{
delete wxXmlResource::Set(NULL);
if(wxXmlResource::ms_subclassFactories)
- WX_CLEAR_LIST(wxXmlSubclassFactoriesList, *wxXmlResource::ms_subclassFactories);
- wxDELETE(wxXmlResource::ms_subclassFactories);
+ {
+ for ( wxXmlSubclassFactories::iterator i = wxXmlResource::ms_subclassFactories->begin();
+ i != wxXmlResource::ms_subclassFactories->end(); ++i )
+ {
+ delete *i;
+ }
+ wxDELETE(wxXmlResource::ms_subclassFactories);
+ }
CleanXRCID_Records();
}
};
projects / wxWidgets.git / blobdiff