X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/46446cc2aa025f445815545b31552a509b5e3f7e..1978421a6d8b81c1f8a961da4b8ddf544fec7b1b:/src/gtk/utilsgtk.cpp diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp index 75972bb8b6..69f73141b6 100644 --- a/src/gtk/utilsgtk.cpp +++ b/src/gtk/utilsgtk.cpp @@ -7,6 +7,9 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + #include "wx/utils.h" #include "wx/string.h" @@ -122,14 +125,23 @@ int wxDisplayDepth() return gdk_window_get_visual( wxGetRootWindow()->window )->depth; } -int wxGUIAppTraits::GetOSVersion(int *majorVsn, int *minorVsn) +wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo() { - if (majorVsn) - *majorVsn = GTK_MAJOR_VERSION; - if (minorVsn) - *minorVsn = GTK_MINOR_VERSION; - - return wxGTK; + static wxToolkitInfo info; +#ifdef __WXGTK20__ + info.shortName = _T("gtk2"); +#else + info.shortName = _T("gtk"); +#endif + info.name = _T("wxGTK"); +#ifdef __WXUNIVERSAL__ + info.shortName << _T("univ"); + info.name << _T("/wxUniversal"); +#endif + info.versionMajor = GTK_MAJOR_VERSION; + info.versionMinor = GTK_MINOR_VERSION; + info.os = wxGTK; + return info; } wxWindow* wxFindWindowAtPoint(const wxPoint& pt)