Further tweaks to GTK+ sensitivity fix

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@58191 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2009-01-18 12:21:04 +00:00
parent ca2c70db6f
commit f4eed492a3
2 changed files with 7 additions and 2 deletions

View File

@@ -103,6 +103,6 @@ private:
}; };
// Fix sensitivity due to bug in GTK+ < 2.14 // Fix sensitivity due to bug in GTK+ < 2.14
void wxGtkFixSensitivity(wxWindow* ctrl); void WXDLLEXPORT wxGtkFixSensitivity(wxWindow* ctrl);
#endif // _WX_GTK_CONTROL_H_ #endif // _WX_GTK_CONTROL_H_

View File

@@ -22,6 +22,7 @@
#include "wx/fontutil.h" #include "wx/fontutil.h"
#include "wx/utils.h" #include "wx/utils.h"
#include "wx/gtk/private.h" #include "wx/gtk/private.h"
#include "wx/sysopt.h"
// ============================================================================ // ============================================================================
// wxControl implementation // wxControl implementation
@@ -384,7 +385,11 @@ void wxGtkFixSensitivity(wxWindow* ctrl)
#ifdef __WXGTK24__ #ifdef __WXGTK24__
// Work around a GTK+ bug whereby button is insensitive after being // Work around a GTK+ bug whereby button is insensitive after being
// enabled // enabled
if (gtk_check_version(2,14,0)) if (gtk_check_version(2,14,0)
#if wxUSE_SYSTEM_OPTIONS
&& (wxSystemOptions::GetOptionInt(wxT("gtk.control.disable-sensitivity-fix")) != 1)
#endif
)
{ {
wxPoint pt = wxGetMousePosition(); wxPoint pt = wxGetMousePosition();
wxRect rect(ctrl->ClientToScreen(wxPoint(0, 0)), ctrl->GetSize()); wxRect rect(ctrl->ClientToScreen(wxPoint(0, 0)), ctrl->GetSize());