Add wxABI_VERSION > 20601 wrappers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34878 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
121aea4614
commit
0f8218d7ca
@ -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
|
||||
{
|
||||
|
@ -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
|
||||
// ----------------------------------------------------------------------------
|
||||
|
@ -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
|
||||
|
@ -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;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user