Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed loading from in-memory document (illicit idea)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8442 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2000-09-29 19:58:31 +00:00
parent 2e12c11a90
commit 426bb74a93
2 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/include/wx/xml/xmlres.h
View File

@@ -45,7 +45,6 @@ class WXDLLEXPORT wxXmlResourceDataRecord
wxString File; wxString File;
wxXmlDocument *Doc; wxXmlDocument *Doc;
bool DocOwned;
wxDateTime Time; wxDateTime Time;
}; };
@@ -110,7 +109,7 @@ class WXDLLEXPORT wxXmlResource : public wxObject
wxPanel *LoadPanel(wxWindow *parent, const wxString& name); wxPanel *LoadPanel(wxWindow *parent, const wxString& name);
bool LoadPanel(wxPanel *panel, wxWindow *parent, const wxString& name); bool LoadPanel(wxPanel *panel, wxWindow *parent, const wxString& name);
// Load bitmap or icon resource from file: // Loads bitmap or icon resource from file:
wxBitmap LoadBitmap(const wxString& name); wxBitmap LoadBitmap(const wxString& name);
wxIcon LoadIcon(const wxString& name); wxIcon LoadIcon(const wxString& name);

10
contrib/src/xml/xmlres.cpp
View File

@@ -54,12 +54,6 @@ wxXmlResource::wxXmlResource(const wxString& filemask, bool use_locale = TRUE)
wxXmlResource::~wxXmlResource() wxXmlResource::~wxXmlResource()
{ {
for (size_t i = 0; i < m_Data.GetCount(); i++)
{
if (!m_Data[i].DocOwned) m_Data[i].Doc = NULL;
// we don't want it to be deleted
}
ClearHandlers(); ClearHandlers();
} }
@@ -97,7 +91,6 @@ bool wxXmlResource::Load(const wxString& filemask)
drec = new wxXmlResourceDataRecord; drec = new wxXmlResourceDataRecord;
drec->File = fnd2; drec->File = fnd2;
m_Data.Add(drec); m_Data.Add(drec);
drec->DocOwned = TRUE;
fnd2 = fs2.FindNext(); fnd2 = fs2.FindNext();
} }
} }
@@ -106,7 +99,6 @@ bool wxXmlResource::Load(const wxString& filemask)
{ {
drec = new wxXmlResourceDataRecord; drec = new wxXmlResourceDataRecord;
drec->File = fnd; drec->File = fnd;
drec->DocOwned = TRUE;
m_Data.Add(drec); m_Data.Add(drec);
} }
@@ -268,8 +260,6 @@ void wxXmlResource::UpdateResources()
for (size_t i = 0; i < m_Data.GetCount(); i++) for (size_t i = 0; i < m_Data.GetCount(); i++)
{ {
if (!m_Data[i].DocOwned) continue;
modif = (m_Data[i].Doc == NULL); modif = (m_Data[i].Doc == NULL);
if (!modif) if (!modif)