Fix VC++ compile error

[wxWidgets.git] / src / gtk / control.cpp

diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp
index ea16fae76ada5c3137eb01bf789742f0555d309b..0191a2f91963ab654f5c73eab6b611b06677ccbb 100644 (file)
--- 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/fontutil.h"
 #include "wx/gtk/private.h"

+#include "wx/utils.h"
+#include "wx/sysopt.h"

 
 #include "wx/gtk/private/mnemonics.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") );
 
     // 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;
 }
     CacheBestSize(best);
     return best;
 }


@@ -82,10 +89,34 @@ void wxControl::PostCreation(const wxSize& size)
     //     GetBestSize is called.
     gtk_widget_ensure_style(m_widget);
 
     //     GetBestSize is called.
     gtk_widget_ensure_style(m_widget);
 

-    ApplyWidgetStyle();
+    GTKApplyWidgetStyle();

     SetInitialSize(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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxControl dealing with labels
 // ----------------------------------------------------------------------------


@@ -289,17 +320,10 @@ wxControl::GetDefaultAttributesFromGTKWidget(wxGtkWidgetNewFromAdj_t widget_new,
 
 void wxControl::OnInternalIdle()
 {
 
 void wxControl::OnInternalIdle()
 {

-    if ( GtkShowFromOnIdle() )
+    if ( GTKShowFromOnIdle() )

         return;
 
         return;
 

-    if ( GTK_WIDGET_REALIZED(m_widget) )
-    {
-        GTKUpdateCursor();
-
-        GTKSetDelayedFocusIfNeeded();
-    }
-
-    if ( wxUpdateUIEvent::CanUpdate(this) )
+    if ( wxUpdateUIEvent::CanUpdate(this) && IsShownOnScreen() )

         UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
 }
 
         UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
 }