Changeset 69296 in webkit
- Timestamp:
- Oct 7, 2010 5:20:10 AM (13 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r69293 r69296 1 2010-10-07 Carlos Garcia Campos <cgarcia@igalia.com> 2 3 Reviewed by Xan Lopez. 4 5 [GTK] Fix the build for GTK+ 3 6 https://bugs.webkit.org/show_bug.cgi?id=47249 7 8 Use GdkVisual instead of GdkColormap. GdkColormap has been removed 9 in gtk3. 10 11 * plugins/gtk/PluginViewGtk.cpp: 12 (WebCore::PluginView::platformStart): 13 * plugins/gtk/gtk2xtbin.c: 14 (gtk_xtbin_new): 15 1 16 2010-10-07 Carlos Garcia Campos <cgarcia@igalia.com> 2 17 -
trunk/WebCore/plugins/gtk/PluginViewGtk.cpp
r67327 r69296 843 843 GdkWindow* window = gtk_widget_get_window(widget); 844 844 ws->display = GDK_WINDOW_XDISPLAY(window); 845 ws->visual = GDK_VISUAL_XVISUAL(gdk_ drawable_get_visual(GDK_DRAWABLE(window)));846 ws->depth = gdk_visual_get_depth(gdk_ drawable_get_visual(GDK_DRAWABLE(window)));847 ws->colormap = GDK_COLORMAP_XCOLORMAP(gdk_drawable_get_colormap(GDK_DRAWABLE(window)));845 ws->visual = GDK_VISUAL_XVISUAL(gdk_window_get_visual(window)); 846 ws->depth = gdk_visual_get_depth(gdk_window_get_visual(window)); 847 ws->colormap = XCreateColormap(ws->display, GDK_ROOT_WINDOW(), ws->visual, AllocNone); 848 848 } else { 849 849 m_npWindow.window = (void*)GTK_XTBIN(platformPluginWidget())->xtwindow; -
trunk/WebCore/plugins/gtk/gtk2xtbin.c
r65897 r69296 327 327 GtkXtBin *xtbin; 328 328 gpointer user_data; 329 GdkScreen *screen; 329 330 GdkVisual* visual; 330 GdkColormap*colormap;331 Colormap colormap; 331 332 332 333 assert(parent_window != NULL); … … 342 343 xtbin->parent_window = parent_window; 343 344 344 visual = gtk_widget_get_default_visual(); 345 colormap = gtk_widget_get_default_colormap(); 345 screen = gtk_widget_get_screen(GTK_WIDGET(parent_window)); 346 visual = gdk_screen_get_system_visual(screen); 347 colormap = XCreateColormap(GDK_DISPLAY_XDISPLAY(gdk_screen_get_display(screen)), 348 GDK_WINDOW_XWINDOW(gdk_screen_get_root_window(screen)), 349 GDK_VISUAL_XVISUAL(visual), AllocNone); 346 350 347 351 xt_client_init(&(xtbin->xtclient), 348 352 GDK_VISUAL_XVISUAL(visual), 349 GDK_COLORMAP_XCOLORMAP(colormap),353 colormap, 350 354 gdk_visual_get_depth(visual)); 351 355 -
trunk/WebKit/gtk/ChangeLog
r69293 r69296 1 2010-10-07 Carlos Garcia Campos <cgarcia@igalia.com> 2 3 Reviewed by Xan Lopez. 4 5 [GTK] Fix the build for GTK+ 3 6 https://bugs.webkit.org/show_bug.cgi?id=47249 7 8 Use GdkVisual instead of GdkColormap. GdkColormap has been removed 9 in gtk3 10 11 * webkit/webkitwebview.cpp: 12 (webkit_web_view_realize): 13 1 14 2010-10-07 Carlos Garcia Campos <cgarcia@igalia.com> 2 15 -
trunk/WebKit/gtk/webkit/webkitwebview.cpp
r69293 r69296 849 849 attributes.wclass = GDK_INPUT_OUTPUT; 850 850 attributes.visual = gtk_widget_get_visual(widget); 851 #ifdef GTK_API_VERSION_2 851 852 attributes.colormap = gtk_widget_get_colormap(widget); 853 #endif 852 854 attributes.event_mask = GDK_VISIBILITY_NOTIFY_MASK 853 855 | GDK_EXPOSURE_MASK … … 862 864 | GDK_BUTTON3_MOTION_MASK; 863 865 864 gint attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP; 866 gint attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL; 867 #ifdef GTK_API_VERSION_2 868 attributes_mask |= GDK_WA_COLORMAP; 869 #endif 865 870 GdkWindow* window = gdk_window_new(gtk_widget_get_parent_window(widget), &attributes, attributes_mask); 866 871 gtk_widget_set_window(widget, window);
Note: See TracChangeset
for help on using the changeset viewer.