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

Add wxABI_VERSION > 20601 wrappers

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34878 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2005-07-17 13:00:11 +00:00
parent 121aea4614
commit 0f8218d7ca
4 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/log.h
View File

@@ -288,6 +288,8 @@ private:
// "trivial" derivations of wxLog // "trivial" derivations of wxLog
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#if wxABI_VERSION > 20601
// log everything to a buffer // log everything to a buffer
class WXDLLIMPEXP_BASE wxLogBuffer : public wxLog class WXDLLIMPEXP_BASE wxLogBuffer : public wxLog
{ {
@@ -311,6 +313,8 @@ private:
DECLARE_NO_COPY_CLASS(wxLogBuffer) DECLARE_NO_COPY_CLASS(wxLogBuffer)
}; };
#endif // wxABI_VERSION
// log everything to a "FILE *", stderr by default // log everything to a "FILE *", stderr by default
class WXDLLIMPEXP_BASE wxLogStderr : public wxLog class WXDLLIMPEXP_BASE wxLogStderr : public wxLog
{ {

4
include/wx/msgout.h
View File

@@ -60,6 +60,8 @@ private:
// otherwise; unlike wxMessageOutputMessageBox this class is always safe to use // otherwise; unlike wxMessageOutputMessageBox this class is always safe to use
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#if wxABI_VERSION > 20601
class WXDLLIMPEXP_BASE wxMessageOutputBest : public wxMessageOutput class WXDLLIMPEXP_BASE wxMessageOutputBest : public wxMessageOutput
{ {
public: public:
@@ -68,6 +70,8 @@ public:
virtual void Printf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2; virtual void Printf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2;
}; };
#endif // wxABI_VERSION
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// implementation which sends output to stderr // implementation which sends output to stderr
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

2
include/wx/utils.h
View File

@@ -324,8 +324,10 @@ WXDLLIMPEXP_BASE bool wxHandleFatalExceptions(bool doit = true);
#endif // wxUSE_ON_FATAL_EXCEPTION #endif // wxUSE_ON_FATAL_EXCEPTION
#if wxABI_VERSION > 20601
// Launch url in the user's default internet browser // Launch url in the user's default internet browser
WXDLLIMPEXP_BASE bool wxLaunchDefaultBrowser(const wxString& url); WXDLLIMPEXP_BASE bool wxLaunchDefaultBrowser(const wxString& url);
#endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Environment variables // Environment variables

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

@@ -124,8 +124,10 @@ public:
// This method understands VFS (see filesys.h). // This method understands VFS (see filesys.h).
bool Load(const wxString& filemask); bool Load(const wxString& filemask);
#if wxABI_VERSION > 20601
// Unload resource from the given XML file (wildcards not allowed) // Unload resource from the given XML file (wildcards not allowed)
bool Unload(const wxString& filename); bool Unload(const wxString& filename);
#endif // wxABI_VERSION
// Initialize handlers for all supported controls/windows. This will // Initialize handlers for all supported controls/windows. This will
// make the executable quite big because it forces linking against // make the executable quite big because it forces linking against
@@ -253,6 +255,7 @@ protected:
wxObject *instance = NULL, wxObject *instance = NULL,
wxXmlResourceHandler *handlerToUse = NULL); wxXmlResourceHandler *handlerToUse = NULL);
#if wxABI_VERSION > 20601
// Helper of Load() and Unload(): returns the URL corresponding to the // Helper of Load() and Unload(): returns the URL corresponding to the
// given file if it's indeed a file, otherwise returns the original string // given file if it's indeed a file, otherwise returns the original string
// unmodified // unmodified
@@ -264,6 +267,8 @@ protected:
static bool IsArchive(const wxString& filename); static bool IsArchive(const wxString& filename);
#endif // wxUSE_FILESYSTEM #endif // wxUSE_FILESYSTEM
#endif // wxABI_VERSION
private: private:
long m_version; long m_version;