Changeset 53351 in webkit

Timestamp:

Jan 15, 2010 5:13:11 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-01-15 Alejandro G. Castro <​alex@igalia.com>

Reviewed by Xan Lopez.

Original patch by David Ronis <​david.ronis@mcgill.ca>

Upgrade 1.1.17->1.1.18 fails: GTK_WIDGET_TOPLEVEL' was not declared in this scope
​https://bugs.webkit.org/show_bug.cgi?id=33486

Deprecated symbols replaced for gtk+ versions over 2.18.

• platform/gtk/PlatformScreenGtk.cpp: (WebCore::getVisual): (WebCore::screenRect):

2010-01-15 Alejandro G. Castro <​alex@igalia.com>

Reviewed by Xan Lopez.

Original patch by David Ronis <​david.ronis@mcgill.ca>

Upgrade 1.1.17->1.1.18 fails: GTK_WIDGET_TOPLEVEL' was not declared in this scope
​https://bugs.webkit.org/show_bug.cgi?id=33486

Deprecated symbols replaced for gtk+ versions over 2.18.

• WebCoreSupport/ChromeClientGtk.cpp: (WebKit::ChromeClient::windowRect):
• webkit/webkitprivate.cpp: (currentToplevelCallback):
• webkit/webkitwebframe.cpp: (webkit_web_frame_print_full): (webkit_web_frame_print):
• webkit/webkitwebview.cpp: (webkit_web_view_focus_in_event):

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/gtk/PlatformScreenGtk.cpp (modified) (2 diffs)
• WebKit/gtk/ChangeLog (modified) (1 diff)
• WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp (modified) (3 diffs)
• WebKit/gtk/webkit/webkitprivate.cpp (modified) (1 diff)
• WebKit/gtk/webkit/webkitwebframe.cpp (modified) (3 diffs)
• WebKit/gtk/webkit/webkitwebview.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-15  Alejandro G. Castro  <alex@igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        Original patch by David Ronis <david.ronis@mcgill.ca>
+
+        Upgrade 1.1.17->1.1.18 fails: GTK_WIDGET_TOPLEVEL' was not declared in this scope
+        https://bugs.webkit.org/show_bug.cgi?id=33486
+
+        Deprecated symbols replaced for gtk+ versions over 2.18.
+
+        * platform/gtk/PlatformScreenGtk.cpp:
+        (WebCore::getVisual):
+        (WebCore::screenRect):
+
 2010-01-15  Oliver Hunt  <oliver@apple.com>
 

trunk/WebCore/platform/gtk/PlatformScreenGtk.cpp

@@ -57 +57 @@
     if (!GTK_WIDGET_REALIZED(container)) {
         GtkWidget* toplevel = gtk_widget_get_toplevel(container);
+#if GTK_CHECK_VERSION(2, 18, 0)
+        if (gtk_widget_is_toplevel(toplevel))
+#else
         if (GTK_WIDGET_TOPLEVEL(toplevel))
+#endif
             container = toplevel;
         else
@@ -95 +99 @@
 
     GtkWidget* container = gtk_widget_get_toplevel(GTK_WIDGET(widget->root()->hostWindow()->platformPageClient()));
+#if GTK_CHECK_VERSION(2, 18, 0)
+    if (!gtk_widget_is_toplevel(container))
+#else
     if (!GTK_WIDGET_TOPLEVEL(container))
+#endif
         return FloatRect();
 

trunk/WebKit/gtk/ChangeLog

@@ +1 @@
+2010-01-15  Alejandro G. Castro  <alex@igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        Original patch by David Ronis <david.ronis@mcgill.ca>
+
+        Upgrade 1.1.17->1.1.18 fails: GTK_WIDGET_TOPLEVEL' was not declared in this scope
+        https://bugs.webkit.org/show_bug.cgi?id=33486
+
+        Deprecated symbols replaced for gtk+ versions over 2.18.
+
+        * WebCoreSupport/ChromeClientGtk.cpp:
+        (WebKit::ChromeClient::windowRect):
+        * webkit/webkitprivate.cpp:
+        (currentToplevelCallback):
+        * webkit/webkitwebframe.cpp:
+        (webkit_web_frame_print_full):
+        (webkit_web_frame_print):
+        * webkit/webkitwebview.cpp:
+        (webkit_web_view_focus_in_event):
+
 2010-01-14  Gustavo Noronha Silva  <gns@gnome.org>
 

trunk/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp

@@ -65 +65 @@
 {
     GtkWidget* window = gtk_widget_get_toplevel(GTK_WIDGET(m_webView));
+#if GTK_CHECK_VERSION(2, 18, 0)
+    if (gtk_widget_is_toplevel(window)) {
+#else
     if (GTK_WIDGET_TOPLEVEL(window)) {
+#endif
         gint left, top, width, height;
         gtk_window_get_position(GTK_WINDOW(window), &left, &top);
@@ -107 +111 @@
 {
     GtkWidget* window = gtk_widget_get_toplevel(GTK_WIDGET(m_webView));
+#if GTK_CHECK_VERSION(2, 18, 0)
+    if (gtk_widget_is_toplevel(window))
+#else
     if (GTK_WIDGET_TOPLEVEL(window))
+#endif
         gtk_window_set_focus(GTK_WINDOW(window), NULL);
 }
@@ -235 +243 @@
 bool ChromeClient::canTakeFocus(FocusDirection)
 {
+#if GTK_CHECK_VERSION(2, 18, 0)
+    return gtk_widget_get_can_focus(GTK_WIDGET(m_webView));
+#else
     return GTK_WIDGET_CAN_FOCUS(m_webView);
+#endif
 }
 

trunk/WebKit/gtk/webkit/webkitprivate.cpp

@@ -224 +224 @@
 
     GtkWidget* toplevel =  gtk_widget_get_toplevel(GTK_WIDGET(frame->page()->chrome()->platformPageClient()));
+#if GTK_CHECK_VERSION(2, 18, 0)
+    if (gtk_widget_is_toplevel(toplevel))
+#else
     if (GTK_WIDGET_TOPLEVEL(toplevel))
+#endif
         return toplevel;
     else

trunk/WebKit/gtk/webkit/webkitwebframe.cpp

@@ -911 +911 @@
 
     GtkWidget* topLevel = gtk_widget_get_toplevel(GTK_WIDGET(webkit_web_frame_get_web_view(frame)));
+
+#if GTK_CHECK_VERSION(2, 18, 0)
+    if (!gtk_widget_is_toplevel(topLevel))
+#else
     if (!GTK_WIDGET_TOPLEVEL(topLevel))
+#endif
         topLevel = NULL;
 
@@ -950 +955 @@
     if (error) {
         GtkWidget* window = gtk_widget_get_toplevel(GTK_WIDGET(priv->webView));
+#if GTK_CHECK_VERSION(2, 18, 0)
+        GtkWidget* dialog = gtk_message_dialog_new(gtk_widget_is_toplevel(window) ? GTK_WINDOW(window) : 0,
+                                                   GTK_DIALOG_DESTROY_WITH_PARENT,
+                                                   GTK_MESSAGE_ERROR,
+                                                   GTK_BUTTONS_CLOSE,
+                                                   "%s", error->message);
+#else
         GtkWidget* dialog = gtk_message_dialog_new(GTK_WIDGET_TOPLEVEL(window) ? GTK_WINDOW(window) : 0,
                                                    GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -955 +967 @@
                                                    GTK_BUTTONS_CLOSE,
                                                    "%s", error->message);
+#endif
+
         g_error_free(error);
 

trunk/WebKit/gtk/webkit/webkitwebview.cpp

@@ -651 +651 @@
     // http://bugs.webkit.org/show_bug.cgi?id=16910
     GtkWidget* toplevel = gtk_widget_get_toplevel(widget);
+#if GTK_CHECK_VERSION(2, 18, 0)
+    if (gtk_widget_is_toplevel(toplevel) && gtk_window_has_toplevel_focus(GTK_WINDOW(toplevel))) {
+#else
     if (GTK_WIDGET_TOPLEVEL(toplevel) && gtk_window_has_toplevel_focus(GTK_WINDOW(toplevel))) {
+#endif
         WebKitWebView* webView = WEBKIT_WEB_VIEW(widget);
         FocusController* focusController = core(webView)->focusController();
@@ -840 +844 @@
 
     window = gtk_widget_get_toplevel(GTK_WIDGET(webView));
+#if GTK_CHECK_VERSION(2, 18, 0)
+    dialog = gtk_message_dialog_new(gtk_widget_is_toplevel(window) ? GTK_WINDOW(window) : 0, GTK_DIALOG_DESTROY_WITH_PARENT, messageType, buttons, "%s", message);
+#else
     dialog = gtk_message_dialog_new(GTK_WIDGET_TOPLEVEL(window) ? GTK_WINDOW(window) : 0, GTK_DIALOG_DESTROY_WITH_PARENT, messageType, buttons, "%s", message);
+#endif
     gchar* title = g_strconcat("JavaScript - ", webkit_web_frame_get_uri(frame), NULL);
     gtk_window_set_title(GTK_WINDOW(dialog), title);