From: Vadim Zeitlin Date: Thu, 30 Dec 2010 22:37:03 +0000 (+0000) Subject: Move wxGetLibraryVersionInfo() to core from base. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/9aea2510431d7109ff7055bce02576ebd80f593b?ds=inline Move wxGetLibraryVersionInfo() to core from base. This function uses the GUI toolkit information and so can't be defined in wxBase. The code only compiled before because the function was erroneously defined in wxCore even though it was declared as WXDLLIMPEXP_BASE. Fix this by declaring it with WXDLLIMPEXP_CORE too. This corrects problems in MSW DLL build. If we need to get a string containing user-readable wxBase version too, we should add another function (as it's not possible to virtualize this one) but such function doesn't seem incredibly useful to have anyhow. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66493 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/utils.h b/include/wx/utils.h index ce6951c2db..0906fa834c 100644 --- a/include/wx/utils.h +++ b/include/wx/utils.h @@ -141,7 +141,7 @@ WXDLLIMPEXP_BASE void wxBell(); WXDLLIMPEXP_CORE void wxInfoMessageBox(wxWindow* parent); #endif // wxUSE_MSGDLG -WXDLLIMPEXP_BASE wxVersionInfo wxGetLibraryVersionInfo(); +WXDLLIMPEXP_CORE wxVersionInfo wxGetLibraryVersionInfo(); // Get OS description as a user-readable string WXDLLIMPEXP_BASE wxString wxGetOsDescription(); diff --git a/interface/wx/utils.h b/interface/wx/utils.h index b0f11b9f8b..8d25909600 100644 --- a/interface/wx/utils.h +++ b/interface/wx/utils.h @@ -150,12 +150,18 @@ void wxBell(); */ void wxInfoMessageBox(wxWindow* parent); +//@} + +/** @addtogroup group_funcmacro_version */ +//@{ + /** Get wxWidgets version information. @since 2.9.2 @see wxVersionInfo @header{wx/utils.h} + @library{wxcore} */ wxVersionInfo wxGetLibraryVersionInfo();