X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e1ac8c99e46219a3bfd539c0bd06fe6b7adb44ad..3cfde7c049bddf6fd3b4c2e35a6b8ecdcdc1d74f:/src/gtk/control.cpp

diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp
index 302c5018b6..4b163a3d9c 100644
--- a/src/gtk/control.cpp
+++ b/src/gtk/control.cpp
@@ -21,6 +21,8 @@
 
 #include "wx/fontutil.h"
 #include "wx/gtk/private.h"
+#include "wx/utils.h"
+#include "wx/sysopt.h"
 
 #include "wx/gtk/private/mnemonics.h"
 
@@ -60,13 +62,18 @@ wxSize wxControl::DoGetBestSize() const
     // Do not return any arbitrary default value...
     wxASSERT_MSG( m_widget, wxT("DoGetBestSize called before creation") );
 
-    GtkRequisition req;
-    req.width = 2;
-    req.height = 2;
-    (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request )
-        (m_widget, &req );
-
-    wxSize best(req.width, req.height);
+    wxSize best;
+    if (m_wxwindow)
+    {
+        // this is not a native control, size_request is likely to be (0,0)
+        best = wxControlBase::DoGetBestSize();
+    }
+    else
+    {
+        GtkRequisition req;
+        GTK_WIDGET_GET_CLASS(m_widget)->size_request(m_widget, &req);
+        best.Set(req.width, req.height);
+    }
     CacheBestSize(best);
     return best;
 }
@@ -86,6 +93,30 @@ void wxControl::PostCreation(const wxSize& size)
     SetInitialSize(size);
 }
 
+// ----------------------------------------------------------------------------
+// Work around a GTK+ bug whereby button is insensitive after being
+// enabled
+// ----------------------------------------------------------------------------
+
+// Fix sensitivity due to bug in GTK+ < 2.14
+void wxControl::GTKFixSensitivity(bool onlyIfUnderMouse)
+{
+    if (gtk_check_version(2,14,0)
+#if wxUSE_SYSTEM_OPTIONS
+        && (wxSystemOptions::GetOptionInt(wxT("gtk.control.disable-sensitivity-fix")) != 1)
+#endif
+        )
+    {
+        wxPoint pt = wxGetMousePosition();
+        wxRect rect(ClientToScreen(wxPoint(0, 0)), GetSize());
+        if (!onlyIfUnderMouse || rect.Contains(pt))
+        {
+            Hide();
+            Show();
+        }
+    }
+}
+
 // ----------------------------------------------------------------------------
 // wxControl dealing with labels
 // ----------------------------------------------------------------------------