removed wxABI_VERSION checks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35690 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -120,10 +120,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
|
||||
@@ -251,7 +249,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
|
||||
@@ -263,8 +260,6 @@ protected:
|
||||
static bool IsArchive(const wxString& filename);
|
||||
#endif // wxUSE_FILESYSTEM
|
||||
|
||||
#endif // wxABI_VERSION
|
||||
|
||||
private:
|
||||
long m_version;
|
||||
|
||||
|
Reference in New Issue
Block a user