Add wxABI_VERSION > 20601 wrappers

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34878 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/log.h b/include/wx/log.h
index 13230917c645bf29fa9dae7aa9c5bffc96d872f2..b1309ce30ab91f0839185d77f46d8877f138ccaa 100644 (file)
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -288,6 +288,8 @@ private:
 // "trivial" derivations of wxLog
 // ----------------------------------------------------------------------------
 
+#if wxABI_VERSION > 20601
+
 // log everything to a buffer
 class WXDLLIMPEXP_BASE wxLogBuffer : public wxLog
 {
@@ -311,6 +313,8 @@ private:
     DECLARE_NO_COPY_CLASS(wxLogBuffer)
 };
 
+#endif // wxABI_VERSION
+
 // log everything to a "FILE *", stderr by default
 class WXDLLIMPEXP_BASE wxLogStderr : public wxLog
 {

diff --git a/include/wx/msgout.h b/include/wx/msgout.h
index bd3719e79d4e202b9f293450c6c4aa34573f4deb..f9dcef7892aee5cba607d9e464df6095b25b0039 100755 (executable)
--- a/include/wx/msgout.h
+++ b/include/wx/msgout.h
@@ -60,6 +60,8 @@ private:
 // otherwise; unlike wxMessageOutputMessageBox this class is always safe to use
 // ----------------------------------------------------------------------------
 
+#if wxABI_VERSION > 20601
+
 class WXDLLIMPEXP_BASE wxMessageOutputBest : public wxMessageOutput
 {
 public:
@@ -68,6 +70,8 @@ public:
     virtual void Printf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2;
 };
 
+#endif // wxABI_VERSION
+
 // ----------------------------------------------------------------------------
 // implementation which sends output to stderr
 // ----------------------------------------------------------------------------

diff --git a/include/wx/utils.h b/include/wx/utils.h
index 9c73ab4214d4fdd662956ce0c7836845eaffe22f..619ba3c216184f5ed5eda73142d489d8044b6edd 100644 (file)
--- a/include/wx/utils.h
+++ b/include/wx/utils.h
@@ -324,8 +324,10 @@ WXDLLIMPEXP_BASE bool wxHandleFatalExceptions(bool doit = true);
 
 #endif // wxUSE_ON_FATAL_EXCEPTION
 
+#if wxABI_VERSION > 20601
 // Launch url in the user's default internet browser
 WXDLLIMPEXP_BASE bool wxLaunchDefaultBrowser(const wxString& url);
+#endif
 
 // ----------------------------------------------------------------------------
 // Environment variables

diff --git a/include/wx/xrc/xmlres.h b/include/wx/xrc/xmlres.h
index b90ea184108fdfb2aafd9e426acd24c27c1ac5ab..5f0a85cef51cb19e7b21b003e2e5104f58d597f7 100644 (file)
--- a/include/wx/xrc/xmlres.h
+++ b/include/wx/xrc/xmlres.h
@@ -124,8 +124,10 @@ 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
@@ -253,6 +255,7 @@ 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
@@ -264,6 +267,8 @@ protected:
     static bool IsArchive(const wxString& filename);
 #endif // wxUSE_FILESYSTEM
 
+#endif // wxABI_VERSION
+
 private:
     long m_version;