Title: [108996] trunk/Source/WebKit/gtk
- Revision
- 108996
- Author
- k...@webkit.org
- Date
- 2012-02-27 08:54:29 -0800 (Mon, 27 Feb 2012)
Log Message
Build fix for building with GTK+ 2.x.
Patch by Vincent Untz <vu...@gnome.org>> and Gustavo Noronha Silva <g...@gnome.org> on 2012-02-27
* tests/testwebview.c:
Modified Paths
Diff
Modified: trunk/Source/WebKit/gtk/ChangeLog (108995 => 108996)
--- trunk/Source/WebKit/gtk/ChangeLog 2012-02-27 16:36:53 UTC (rev 108995)
+++ trunk/Source/WebKit/gtk/ChangeLog 2012-02-27 16:54:29 UTC (rev 108996)
@@ -1,3 +1,9 @@
+2012-02-27 Vincent Untz <vu...@gnome.org>> and Gustavo Noronha Silva <g...@gnome.org>
+
+ Build fix for building with GTK+ 2.x.
+
+ * tests/testwebview.c:
+
2012-02-26 Hajime Morrita <morr...@chromium.org>
Move ChromeClient::showContextMenu() to ContextMenuClient
Modified: trunk/Source/WebKit/gtk/tests/testwebview.c (108995 => 108996)
--- trunk/Source/WebKit/gtk/tests/testwebview.c 2012-02-27 16:36:53 UTC (rev 108995)
+++ trunk/Source/WebKit/gtk/tests/testwebview.c 2012-02-27 16:54:29 UTC (rev 108996)
@@ -27,6 +27,8 @@
#include <glib.h>
#include <glib/gstdio.h>
+#include <gdk/gdk.h>
+#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
#include <webkit/webkit.h>
@@ -389,7 +391,12 @@
GtkWidget *window = gtk_offscreen_window_new();
GtkWidget *webView = webkit_web_view_new();
GtkWidget *entry = gtk_entry_new();
+
+#ifdef GTK_API_VERSION_2
+ GtkWidget *box = gtk_hbox_new(FALSE, 0);
+#else
GtkWidget *box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+#endif
gtk_container_add(GTK_CONTAINER(box), webView);
gtk_container_add(GTK_CONTAINER(box), entry);
@@ -424,8 +431,10 @@
pressEvent->key.window = window;
g_object_ref(pressEvent->key.window);
+#ifndef GTK_API_VERSION_2
GdkDeviceManager* manager = gdk_display_get_device_manager(gdk_window_get_display(window));
gdk_event_set_device(pressEvent, gdk_device_manager_get_client_pointer(manager));
+#endif
// When synthesizing an event, an invalid hardware_keycode value
// can cause it to be badly processed by Gtk+.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
