Changeset 55989 in webkit

Timestamp:

Mar 15, 2010 1:34:45 AM (14 years ago)

Author:

Philippe Normand

Message:

2010-03-09 Philippe Normand <​pnormand@igalia.com>

Reviewed by Holger Freyther.

[GTK] GTK_WIDGET_IS_SENSITIVE is deprecated in GTK+ 2.20
​https://bugs.webkit.org/show_bug.cgi?id=35909

• webkit/webkitwebview.cpp: GTK_WIDGET_IS_SENSITIVE has been deprecated in gtk 2.20. Use gtk_widget_is_sensitive when available.

Location:

trunk/WebKit/gtk

Files:

• ChangeLog (modified) (1 diff)
• webkit/webkitwebview.cpp (modified) (1 diff)

trunk/WebKit/gtk/ChangeLog

@@ +1 @@
+2010-03-09  Philippe Normand  <pnormand@igalia.com>
+
+        Reviewed by Holger Freyther.
+
+        [GTK] GTK_WIDGET_IS_SENSITIVE is deprecated in GTK+ 2.20
+        https://bugs.webkit.org/show_bug.cgi?id=35909
+
+        * webkit/webkitwebview.cpp: GTK_WIDGET_IS_SENSITIVE has been
+        deprecated in gtk 2.20. Use gtk_widget_is_sensitive when available.
+
 2010-03-12  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
 

trunk/WebKit/gtk/webkit/webkitwebview.cpp

@@ -689 +689 @@
 static void webkit_web_view_grab_focus(GtkWidget* widget)
 {
+
+#if GTK_CHECK_VERSION(2, 18, 0)
+    if (gtk_widget_is_sensitive(widget)) {
+#else
     if (GTK_WIDGET_IS_SENSITIVE(widget)) {
+#endif
         WebKitWebView* webView = WEBKIT_WEB_VIEW(widget);
         FocusController* focusController = core(webView)->focusController();