X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0f8218d7ca7c8913bfdf82cad2f7be117a662b0d..991d57f8443fc8a31c2ad3e3a8180af08a6394d6:/include/wx/xrc/xmlres.h?ds=sidebyside diff --git a/include/wx/xrc/xmlres.h b/include/wx/xrc/xmlres.h index 5f0a85cef5..e48c0728c8 100644 --- a/include/wx/xrc/xmlres.h +++ b/include/wx/xrc/xmlres.h @@ -11,10 +11,6 @@ #ifndef _WX_XMLRES_H_ #define _WX_XMLRES_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "xmlres.h" -#endif - #include "wx/defs.h" #if wxUSE_XRC @@ -72,12 +68,18 @@ class wxXmlResourceModule; class WXDLLIMPEXP_XRC wxXmlResourceDataRecord { public: - wxXmlResourceDataRecord() : Doc(NULL), Time(wxDateTime::Now()) {} + wxXmlResourceDataRecord() : Doc(NULL) { +#if wxUSE_DATETIME + Time = wxDateTime::Now(); +#endif + } ~wxXmlResourceDataRecord() {delete Doc;} wxString File; wxXmlDocument *Doc; +#if wxUSE_DATETIME wxDateTime Time; +#endif }; @@ -124,10 +126,8 @@ public: // This method understands VFS (see filesys.h). bool Load(const wxString& filemask); -#if wxABI_VERSION > 20601 // Unload resource from the given XML file (wildcards not allowed) bool Unload(const wxString& filename); -#endif // wxABI_VERSION // Initialize handlers for all supported controls/windows. This will // make the executable quite big because it forces linking against @@ -255,7 +255,6 @@ protected: wxObject *instance = NULL, wxXmlResourceHandler *handlerToUse = NULL); -#if wxABI_VERSION > 20601 // Helper of Load() and Unload(): returns the URL corresponding to the // given file if it's indeed a file, otherwise returns the original string // unmodified @@ -267,8 +266,6 @@ protected: static bool IsArchive(const wxString& filename); #endif // wxUSE_FILESYSTEM -#endif // wxABI_VERSION - private: long m_version;