From f5d9bc0a49d4e09734ce8070f9205efe72300e4e Mon Sep 17 00:00:00 2001 From: David Elliott Date: Fri, 13 Jul 2007 20:25:10 +0000 Subject: [PATCH] Provide versioning for backport of 46117 (wxLog::DoCreateOnDemand). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@47438 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/log.h | 2 ++ version-script.in | 1 + 2 files changed, 3 insertions(+) diff --git a/include/wx/log.h b/include/wx/log.h index b2dd880d2d..3b231dda2a 100644 --- a/include/wx/log.h +++ b/include/wx/log.h @@ -176,9 +176,11 @@ public: // Set log level. Log messages with level > logLevel will not be logged. static void SetLogLevel(wxLogLevel logLevel) { ms_logLevel = logLevel; } +#if wxABI_VERSION >= 20805 /* 2.8.5+ only */ // should GetActiveTarget() try to create a new log object if the // current is NULL? static void DontCreateOnDemand(); +#endif // Make GetActiveTarget() create a new log object again. static void DoCreateOnDemand(); diff --git a/version-script.in b/version-script.in index 18d940175f..391cdc4a35 100644 --- a/version-script.in +++ b/version-script.in @@ -34,6 +34,7 @@ *wxAuiNotebook*SetNormalFont*; *wxAuiNotebook*SetSelectedFont*; *wxDocument*GetUserReadableName*; + *wxLog*DoCreateOnDemand*; *wxLogChain*DetachOldLog*; *wxMemoryFSHandler*AddFileWithMimeType*; *wxMetafileDC*DoGetTextExtent*;