diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp index 81eb2b5761..1222e79ce3 100644 --- a/src/common/wincmn.cpp +++ b/src/common/wincmn.cpp @@ -82,6 +82,19 @@ #include "wx/sysopt.h" #endif +// For reporting compile- and runtime version of GTK+ in the ctrl+alt+mclick dialog. +// The gtk includes donn't pull any other header in, at least not on my system - MR +#ifdef __WXGTK__ + #ifdef __WXGTK20__ + #include + #else + #include + #endif + extern const unsigned int gtk_major_version; + extern const unsigned int gtk_minor_version; + extern const unsigned int gtk_micro_version; +#endif + // ---------------------------------------------------------------------------- // static data // ---------------------------------------------------------------------------- @@ -2280,7 +2293,7 @@ void wxWindowBase::OnMiddleClick( wxMouseEvent& event ) wxMessageBox(wxString::Format( _T( - " wxWidgets Library (%s port)\nVersion %d.%d.%d%s%s, compiled at %s %s\n Copyright (c) 1995-2005 wxWidgets team" + " wxWidgets Library (%s port)\nVersion %d.%d.%d%s%s, compiled at %s %s%s\n Copyright (c) 1995-2005 wxWidgets team" ), port.c_str(), wxMAJOR_VERSION, @@ -2297,7 +2310,12 @@ void wxWindowBase::OnMiddleClick( wxMouseEvent& event ) wxEmptyString, #endif __TDATE__, - __TTIME__ + __TTIME__, +#ifdef __WXGTK__ + wxString::Format(_T("\nagainst GTK+ %d.%d.%d. Runtime GTK+ version: %d.%d.%d"), GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION, gtk_major_version, gtk_minor_version, gtk_micro_version).c_str() +#else + "" +#endif ), _T("wxWidgets information"), wxICON_INFORMATION | wxOK,