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

added wxXRC_NO_RELOADING

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28274 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-07-16 22:01:47 +00:00
parent 31ad423e4f
commit 648db587c4
4 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -93,7 +93,8 @@ WX_DECLARE_USER_EXPORTED_OBJARRAY(wxXmlResourceDataRecord,
enum wxXmlResourceFlags enum wxXmlResourceFlags
{ {
wxXRC_USE_LOCALE = 1, wxXRC_USE_LOCALE = 1,
wxXRC_NO_SUBCLASSING = 2 wxXRC_NO_SUBCLASSING = 2,
wxXRC_NO_RELOADING = 4
}; };
// This class holds XML resources from one or more .xml files // This class holds XML resources from one or more .xml files

5
contrib/src/xrc/xmlres.cpp
View File

@@ -343,7 +343,7 @@ bool wxXmlResource::UpdateResources()
{ {
modif = (m_data[i].Doc == NULL); modif = (m_data[i].Doc == NULL);
if (!modif) if (!modif && !(m_flags & wxXRC_NO_RELOADING))
{ {
# if wxUSE_FILESYSTEM # if wxUSE_FILESYSTEM
file = fsys.OpenFile(m_data[i].File); file = fsys.OpenFile(m_data[i].File);
@@ -362,6 +362,9 @@ bool wxXmlResource::UpdateResources()
if (modif) if (modif)
{ {
wxLogTrace(_T("xrc"),
_T("opening file '%s'"), m_data[i].File.c_str());
wxInputStream *stream = NULL; wxInputStream *stream = NULL;
# if wxUSE_FILESYSTEM # if wxUSE_FILESYSTEM

3
include/wx/xrc/xmlres.h
View File

@@ -93,7 +93,8 @@ WX_DECLARE_USER_EXPORTED_OBJARRAY(wxXmlResourceDataRecord,
enum wxXmlResourceFlags enum wxXmlResourceFlags
{ {
wxXRC_USE_LOCALE = 1, wxXRC_USE_LOCALE = 1,
wxXRC_NO_SUBCLASSING = 2 wxXRC_NO_SUBCLASSING = 2,
wxXRC_NO_RELOADING = 4
}; };
// This class holds XML resources from one or more .xml files // This class holds XML resources from one or more .xml files

5
src/xrc/xmlres.cpp
View File

@@ -343,7 +343,7 @@ bool wxXmlResource::UpdateResources()
{ {
modif = (m_data[i].Doc == NULL); modif = (m_data[i].Doc == NULL);
if (!modif) if (!modif && !(m_flags & wxXRC_NO_RELOADING))
{ {
# if wxUSE_FILESYSTEM # if wxUSE_FILESYSTEM
file = fsys.OpenFile(m_data[i].File); file = fsys.OpenFile(m_data[i].File);
@@ -362,6 +362,9 @@ bool wxXmlResource::UpdateResources()
if (modif) if (modif)
{ {
wxLogTrace(_T("xrc"),
_T("opening file '%s'"), m_data[i].File.c_str());
wxInputStream *stream = NULL; wxInputStream *stream = NULL;
# if wxUSE_FILESYSTEM # if wxUSE_FILESYSTEM