Changeset 61206 in webkit


Ignore:
Timestamp:
Jun 15, 2010 12:14:38 PM (14 years ago)
Author:
xan@webkit.org
Message:

2010-06-15 Xan Lopez <​xlopez@igalia.com>

Reviewed by Gustavo Noronha.

[GTK] Does not compile with -DGSEAL_ENABLE
​https://bugs.webkit.org/show_bug.cgi?id=37851

Add GSEAL_ENABLE flag when doing debug builds.

  • GNUmakefile.am:

WebCore:

2010-06-15 Xan Lopez <​xlopez@igalia.com>

Reviewed by Gustavo Noronha.

[GTK] Does not compile with -DGSEAL_ENABLE
​https://bugs.webkit.org/show_bug.cgi?id=37851

Fix compilation with GSEAL_ENABLE.

  • platform/gtk/GtkVersioning.h:
  • platform/gtk/PlatformScreenGtk.cpp: (WebCore::screenDepth): (WebCore::screenDepthPerComponent):
  • platform/gtk/PopupMenuGtk.cpp: (WebCore::PopupMenu::show):
  • platform/gtk/ScrollbarGtk.cpp: (ScrollbarGtk::detachAdjustment): (ScrollbarGtk::updateThumbPosition): (ScrollbarGtk::updateThumbProportion):
  • plugins/gtk/PluginViewGtk.cpp: (WebCore::PluginView::paint): (WebCore::PluginView::initXEvent): (WebCore::PluginView::platformGetValue): (WebCore::PluginView::platformStart):
  • plugins/gtk/gtk2xtbin.c: (gtk_xtbin_realize): (gtk_xtbin_new): (gtk_xtbin_set_position): (gtk_xtbin_unrealize):

WebKit/gtk:

2010-06-15 Xan Lopez <​xlopez@igalia.com>

Reviewed by Gustavo Noronha.

[GTK] Does not compile with -DGSEAL_ENABLE
​https://bugs.webkit.org/show_bug.cgi?id=37851

Fix compilation with GSEAL_ENABLE.

  • WebCoreSupport/ChromeClientGtk.cpp: (WebKit::ChromeClient::pageRect): (WebKit::ChromeClient::contentsSizeChanged):
  • tests/testdomnode.c: (test_dom_node_insertion):
  • webkit/webkitwebview.cpp: (webkit_web_view_realize): (webkit_web_view_script_dialog): (webkit_web_view_drag_end): (webkit_web_view_init):
Location:
trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r61162 r61206  
     12010-06-15  Xan Lopez  <xlopez@igalia.com>
     2
     3        Reviewed by Gustavo Noronha.
     4
     5        [GTK] Does not compile with -DGSEAL_ENABLE
     6        https://bugs.webkit.org/show_bug.cgi?id=37851
     7
     8        Add GSEAL_ENABLE flag when doing debug builds.
     9
     10        * GNUmakefile.am:
     11
    1122010-06-13  Tony Chang  <tony@chromium.org>
    213

  • trunk/GNUmakefile.am

    r60842 r61206  
    312312global_cppflags += -DNDEBUG
    313313global_cflags += $(SYMBOL_VISIBILITY)
    314 
    315314else
    316315webcoregtk_cppflags += \
    … …  
    319318        -DGDK_DISABLE_DEPRECATED \
    320319        -DGTK_DISABLE_DEPRECATED \
    321         -DPANGO_DISABLE_DEPRECATED
     320        -DPANGO_DISABLE_DEPRECATED \
     321        -DGSEAL_ENABLE
    322322
    323323# Might be useful in the future

  • trunk/WebCore/ChangeLog

    r61201 r61206  
     12010-06-15  Xan Lopez  <xlopez@igalia.com>
     2
     3        Reviewed by Gustavo Noronha.
     4
     5        [GTK] Does not compile with -DGSEAL_ENABLE
     6        https://bugs.webkit.org/show_bug.cgi?id=37851
     7
     8        Fix compilation with GSEAL_ENABLE.
     9
     10        * platform/gtk/GtkVersioning.h:
     11        * platform/gtk/PlatformScreenGtk.cpp:
     12        (WebCore::screenDepth):
     13        (WebCore::screenDepthPerComponent):
     14        * platform/gtk/PopupMenuGtk.cpp:
     15        (WebCore::PopupMenu::show):
     16        * platform/gtk/ScrollbarGtk.cpp:
     17        (ScrollbarGtk::detachAdjustment):
     18        (ScrollbarGtk::updateThumbPosition):
     19        (ScrollbarGtk::updateThumbProportion):
     20        * plugins/gtk/PluginViewGtk.cpp:
     21        (WebCore::PluginView::paint):
     22        (WebCore::PluginView::initXEvent):
     23        (WebCore::PluginView::platformGetValue):
     24        (WebCore::PluginView::platformStart):
     25        * plugins/gtk/gtk2xtbin.c:
     26        (gtk_xtbin_realize):
     27        (gtk_xtbin_new):
     28        (gtk_xtbin_set_position):
     29        (gtk_xtbin_unrealize):
     30
    1312010-06-15  Xan Lopez  <xlopez@igalia.com>
    232

  • trunk/WebCore/platform/gtk/GtkVersioning.h

    r60785 r61206  
    2424
    2525// Macros to avoid deprecation checking churn
     26#if !GTK_CHECK_VERSION(2, 21, 2)
     27#define gdk_visual_get_depth(visual) (visual)->depth
     28#define gdk_visual_get_bits_per_rgb(visual) (visual)->bits_per_rgb
     29#define gdk_drag_context_get_selected_action(context) (context)->action
     30#endif // GTK_CHECK_VERSION(2, 21, 2)
     31
     32#if !GTK_CHECK_VERSION(2, 20, 0)
     33#define gtk_widget_set_realized(widget, FALSE) GTK_WIDGET_UNSET_FLAGS((widget), GTK_REALIZED)
     34#define gtk_widget_set_realized(widget, TRUE) GTK_WIDGET_SET_FLAGS((widget), GTK_REALIZED)
     35#endif // GTK_CHECK_VERSION(2, 20, 0)
     36
    2637#if !GTK_CHECK_VERSION(2, 19, 0)
    2738#define gtk_widget_is_toplevel(widget) GTK_WIDGET_TOPLEVEL(widget)
    … …  
    3243#endif // GTK_CHECK_VERSION(2, 19, 0)
    3344
     45#if !GTK_CHECK_VERSION(2, 18, 0)
     46#define gtk_widget_set_visible(widget, FALSE) GTK_WIDGET_UNSET_FLAGS((widget), GTK_VISIBLE)
     47#define gtk_widget_set_visible(widget, TRUE) GTK_WIDGET_SET_FLAGS((widget), GTK_VISIBLE)
     48#define gtk_widget_set_window(widget, new_window) (widget)->window = (new_window)
     49#define gtk_widget_set_can_focus(widget, FALSE) GTK_WIDGET_UNSET_FLAGS((widget), GTK_CAN_FOCUS)
     50#define gtk_widget_set_can_focus(widget, TRUE) GTK_WIDGET_SET_FLAGS((widget), GTK_CAN_FOCUS)
     51#endif // GTK_CHECK_VERSION(2, 18, 0)
     52
    3453#if !GTK_CHECK_VERSION(2, 14, 0)
    3554#define gtk_widget_get_window(widget) (widget)->window
    36 #endif
     55#define gtk_adjustment_get_value(adj) (adj)->value
     56#define gtk_dialog_get_content_area(dialog) (dialog)->vbox
     57#endif // GTK_CHECK_VERSION(2, 14, 0)
    3758
    3859#endif // GtkVersioning_h

  • trunk/WebCore/platform/gtk/PlatformScreenGtk.cpp

    r60785 r61206  
    7373    if (!visual)
    7474        return 24;
    75     return visual->depth;
     75    return gdk_visual_get_depth(visual);
    7676}
    7777
    … …  
    8282        return 8;
    8383
    84     return visual->bits_per_rgb;
     84    return gdk_visual_get_bits_per_rgb(visual);
    8585}
    8686

  • trunk/WebCore/platform/gtk/PopupMenuGtk.cpp

    r60785 r61206  
    9090    gtk_widget_set_size_request(GTK_WIDGET(m_popup.get()), std::max(rect.width(), requisition.width), -1);
    9191
    92     GList* children = GTK_MENU_SHELL(m_popup.get())->children;
     92    GList* children = gtk_container_get_children(GTK_CONTAINER(m_popup.get()));
     93    GList* p = children;
    9394    if (size)
    9495        for (int i = 0; i < size; i++) {
    … …  
    9697              break;
    9798
    98             GtkWidget* item = reinterpret_cast<GtkWidget*>(children->data);
     99            GtkWidget* item = reinterpret_cast<GtkWidget*>(p->data);
    99100            GtkRequisition itemRequisition;
    100101            gtk_widget_get_child_requisition(item, &itemRequisition);
    101102            m_menuPosition.setY(m_menuPosition.y() - itemRequisition.height);
    102103
    103             children = g_list_next(children);
     104            p = g_list_next(p);
    104105        } else
    105106            // Center vertically the empty popup in the combo box area
    106107            m_menuPosition.setY(m_menuPosition.y() - rect.height() / 2);
    107108
     109    g_list_free(children);
    108110    gtk_menu_popup(m_popup.get(), 0, 0, reinterpret_cast<GtkMenuPositionFunc>(menuPositionFunction), this, 0, gtk_get_current_event_time());
    109111}

  • trunk/WebCore/platform/gtk/ScrollbarGtk.cpp

    r60288 r61206  
    121121    // reset the values so that the surrounding scrollbar gets updated, or
    122122    // e.g. for a GtkScrolledWindow the scrollbar gets hidden.
     123#if GTK_CHECK_VERSION(2, 14, 0)
     124    gtk_adjustment_configure(m_adjustment, 0, 0, 0, 0, 0, 0);
     125#else
    123126    m_adjustment->lower = 0;
    124127    m_adjustment->upper = 0;
    … …  
    126129    gtk_adjustment_changed(m_adjustment);
    127130    gtk_adjustment_value_changed(m_adjustment);
     131#endif
    128132    g_object_unref(m_adjustment);
    129133    m_adjustment = 0;
    … …  
    159163void ScrollbarGtk::updateThumbPosition()
    160164{
    161     if (m_adjustment->value != m_currentPos) {
     165    if (gtk_adjustment_get_value(m_adjustment) != m_currentPos) {
     166#if GTK_CHECK_VERSION(2, 14, 0)
     167        gtk_adjustment_set_value(m_adjustment, m_currentPos);
     168#else
    162169        m_adjustment->value = m_currentPos;
    163170        gtk_adjustment_value_changed(m_adjustment);
     171#endif
    164172    }
    165173}
    … …  
    167175void ScrollbarGtk::updateThumbProportion()
    168176{
     177#if GTK_CHECK_VERSION(2, 14, 0)
     178    gtk_adjustment_configure(m_adjustment,
     179                             gtk_adjustment_get_value(m_adjustment),
     180                             gtk_adjustment_get_lower(m_adjustment),
     181                             m_totalSize,
     182                             m_lineStep,
     183                             m_pageStep,
     184                             m_visibleSize);
     185#else
    169186    m_adjustment->step_increment = m_lineStep;
    170187    m_adjustment->page_increment = m_pageStep;
    … …  
    172189    m_adjustment->upper = m_totalSize;
    173190    gtk_adjustment_changed(m_adjustment);
     191#endif
    174192}
    175193

  • trunk/WebCore/plugins/gtk/PluginViewGtk.cpp

    r58821 r61206  
    4040#include "FrameView.h"
    4141#include "GraphicsContext.h"
     42#include "GtkVersioning.h"
    4243#include "HTMLNames.h"
    4344#include "HTMLPlugInElement.h"
    … …  
    215216        gint xoff = 0, yoff = 0;
    216217
    217         gdk_window_get_internal_paint_info(widget->window, &gdkBackingStore, &xoff, &yoff);
     218        gdk_window_get_internal_paint_info(gtk_widget_get_window(widget), &gdkBackingStore, &xoff, &yoff);
    218219
    219220        GC gc = XDefaultGC(GDK_DISPLAY(), gdk_screen_get_number(gdk_screen_get_default()));
    … …  
    349350    // events; thus, this is right:
    350351    GtkWidget* widget = m_parentFrame->view()->hostWindow()->platformPageClient();
    351     xEvent->xany.window = widget ? GDK_WINDOW_XWINDOW(widget->window) : 0;
     352    xEvent->xany.window = widget ? GDK_WINDOW_XWINDOW(gtk_widget_get_window(widget)) : 0;
    352353}
    353354
    … …  
    657658#if defined(XP_UNIX)
    658659            void* w = reinterpret_cast<void*>(value);
    659             *((XID *)w) = GDK_WINDOW_XWINDOW(m_parentFrame->view()->hostWindow()->platformPageClient()->window);
     660            GtkWidget* widget = m_parentFrame->view()->hostWindow()->platformPageClient();
     661            *((XID *)w) = GDK_WINDOW_XWINDOW(gtk_widget_get_window(widget));
    660662#endif
    661663#ifdef GDK_WINDOWING_WIN32
    662664            HGDIOBJ* w = reinterpret_cast<HGDIOBJ*>(value);
    663             *w = GDK_WINDOW_HWND(m_parentFrame->view()->hostWindow()->platformPageClient()->window);
     665            GtkWidget* widget = m_parentFrame->view()->hostWindow()->platformPageClient();
     666            *w = GDK_WINDOW_HWND(gtk_widget_get_window(widget));
    664667#endif
    665668            *result = NPERR_NO_ERROR;
    … …  
    811814            g_signal_connect(platformPluginWidget(), "plug-removed", G_CALLBACK(plugRemovedCallback), NULL);
    812815        } else
    813             setPlatformWidget(gtk_xtbin_new(pageClient->window, 0));
     816            setPlatformWidget(gtk_xtbin_new(gtk_widget_get_window(pageClient), 0));
    814817#else
    815818        setPlatformWidget(gtk_socket_new());
    … …  
    832835#if defined(XP_UNIX)
    833836        if (m_needsXEmbed) {
    834             gtk_widget_realize(platformPluginWidget());
     837            GtkWidget* widget = platformPluginWidget();
     838            gtk_widget_realize(widget);
    835839            m_npWindow.window = (void*)gtk_socket_get_id(GTK_SOCKET(platformPluginWidget()));
    836             ws->display = GDK_WINDOW_XDISPLAY(platformPluginWidget()->window);
    837             ws->visual = GDK_VISUAL_XVISUAL(gdk_drawable_get_visual(GDK_DRAWABLE(platformPluginWidget()->window)));
    838             ws->depth = gdk_drawable_get_visual(GDK_DRAWABLE(platformPluginWidget()->window))->depth;
    839             ws->colormap = GDK_COLORMAP_XCOLORMAP(gdk_drawable_get_colormap(GDK_DRAWABLE(platformPluginWidget()->window)));
     840            GdkWindow* window = gtk_widget_get_window(widget);
     841            ws->display = GDK_WINDOW_XDISPLAY(window);
     842            ws->visual = GDK_VISUAL_XVISUAL(gdk_drawable_get_visual(GDK_DRAWABLE(window)));
     843            ws->depth = gdk_visual_get_depth(gdk_drawable_get_visual(GDK_DRAWABLE(window)));
     844            ws->colormap = GDK_COLORMAP_XCOLORMAP(gdk_drawable_get_colormap(GDK_DRAWABLE(window)));
    840845        } else {
    841846            m_npWindow.window = (void*)GTK_XTBIN(platformPluginWidget())->xtwindow;
    … …  
    847852        XFlush (ws->display);
    848853#elif defined(GDK_WINDOWING_WIN32)
    849         m_npWindow.window = (void*)GDK_WINDOW_HWND(platformPluginWidget()->window);
     854        m_npWindow.window = (void*)GDK_WINDOW_HWND(gtk_widget_get_window(platformPluginWidget()));
    850855#endif
    851856    } else {
    … …  
    857862        GdkVisual* gvisual = gdk_screen_get_system_visual(gscreen);
    858863
    859         if (gvisual->depth == 32 || !m_plugin->quirks().contains(PluginQuirkRequiresDefaultScreenDepth)) {
     864        if (gdk_visual_get_depth(gvisual) == 32 || !m_plugin->quirks().contains(PluginQuirkRequiresDefaultScreenDepth)) {
    860865            getVisualAndColormap(32, &m_visual, &m_colormap);
    861866            ws->depth = 32;
    … …  
    863868
    864869        if (!m_visual) {
    865             getVisualAndColormap(gvisual->depth, &m_visual, &m_colormap);
    866             ws->depth = gvisual->depth;
     870            getVisualAndColormap(gdk_visual_get_depth(gvisual), &m_visual, &m_colormap);
     871            ws->depth = gdk_visual_get_depth(gvisual);
    867872        }
    868873

  • trunk/WebCore/plugins/gtk/gtk2xtbin.c

    r60438 r61206  
    272272  GtkXtBin     *xtbin;
    273273  GtkAllocation allocation = { 0, 0, 200, 200 };
     274#if GTK_CHECK_VERSION(2, 18, 0)
     275  GtkAllocation widget_allocation;
     276#endif
    274277  gint  x, y, w, h, d; /* geometry of window */
    275278
    … …  
    292295#endif
    293296
     297#if GTK_CHECK_VERSION(2, 18, 0)
     298  gtk_widget_get_allocation(widget, &widget_allocation);
     299  xtbin->width = widget_allocation.width;
     300  xtbin->height = widget_allocation.height;
     301#else
    294302  xtbin->width = widget->allocation.width;
    295303  xtbin->height = widget->allocation.height;
     304#endif
    296305
    297306  /* use GtkSocket's realize */
    … …  
    334343      GDK_VISUAL_XVISUAL(gdk_rgb_get_visual()),
    335344      GDK_COLORMAP_XCOLORMAP(gdk_rgb_get_colormap()),
    336       gdk_rgb_get_visual()->depth);
     345      gdk_visual_get_depth(gdk_rgb_get_visual()));
    337346
    338347  if (!xtbin->xtclient.xtdisplay) {
    … …  
    405414
    406415  if (gtk_widget_get_realized (GTK_WIDGET(xtbin)))
    407     gdk_window_move (GTK_WIDGET (xtbin)->window, x, y);
     416    gdk_window_move (gtk_widget_get_window(GTK_WIDGET (xtbin)), x, y);
    408417}
    409418
    … …  
    458467  widget = GTK_WIDGET(object);
    459468
    460   GTK_WIDGET_UNSET_FLAGS (widget, GTK_VISIBLE);
     469  gtk_widget_set_visible(widget, FALSE);
    461470  if (gtk_widget_get_realized (widget)) {
    462471    xt_client_unrealize(&(xtbin->xtclient));

  • trunk/WebKit/gtk/ChangeLog

    r61124 r61206  
     12010-06-15  Xan Lopez  <xlopez@igalia.com>
     2
     3        Reviewed by Gustavo Noronha.
     4
     5        [GTK] Does not compile with -DGSEAL_ENABLE
     6        https://bugs.webkit.org/show_bug.cgi?id=37851
     7
     8        Fix compilation with GSEAL_ENABLE.
     9
     10        * WebCoreSupport/ChromeClientGtk.cpp:
     11        (WebKit::ChromeClient::pageRect):
     12        (WebKit::ChromeClient::contentsSizeChanged):
     13        * tests/testdomnode.c:
     14        (test_dom_node_insertion):
     15        * webkit/webkitwebview.cpp:
     16        (webkit_web_view_realize):
     17        (webkit_web_view_script_dialog):
     18        (webkit_web_view_drag_end):
     19        (webkit_web_view_init):
     20
    1212010-06-14  Ilya Tikhonovsky  <loislo@chromium.org>
    222

  • trunk/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp

    r60785 r61206  
    105105FloatRect ChromeClient::pageRect()
    106106{
     107    GtkAllocation allocation;
     108#if GTK_CHECK_VERSION(2, 18, 0)
     109    gtk_widget_get_allocation(GTK_WIDGET(m_webView), &allocation);
     110#else
    107111    GtkAllocation allocation = GTK_WIDGET(m_webView)->allocation;
     112#endif
    108113    return IntRect(allocation.x, allocation.y, allocation.width, allocation.height);
    109114}
    … …  
    426431    // otherwise we get into an infinite loop!
    427432    GtkWidget* widget = GTK_WIDGET(m_webView);
     433    GtkRequisition requisition;
     434#if GTK_CHECK_VERSION(2, 20, 0)
     435    gtk_widget_get_requisition(widget, &requisition);
     436#else
     437    requisition = widget->requisition;
     438#endif
    428439    if (gtk_widget_get_realized(widget)
    429         && (widget->requisition.height != size.height())
    430         || (widget->requisition.width != size.width()))
     440        && (requisition.height != size.height())
     441        || (requisition.width != size.width()))
    431442        gtk_widget_queue_resize_no_redraw(widget);
    432443}

  • trunk/WebKit/gtk/webkit/webkitwebview.cpp

    r60841 r61206  
    800800static void webkit_web_view_realize(GtkWidget* widget)
    801801{
    802     GTK_WIDGET_SET_FLAGS(widget, GTK_REALIZED);
     802    gtk_widget_set_realized(widget, TRUE);
     803
     804    GtkAllocation allocation;
     805#if GTK_CHECK_VERSION(2, 18, 0)
     806    gtk_widget_get_allocation(widget, &allocation);
     807#else
     808    allocation = widget->allocation;
     809#endif
    803810
    804811    GdkWindowAttr attributes;
    805812    attributes.window_type = GDK_WINDOW_CHILD;
    806     attributes.x = widget->allocation.x;
    807     attributes.y = widget->allocation.y;
    808     attributes.width = widget->allocation.width;
    809     attributes.height = widget->allocation.height;
     813    attributes.x = allocation.x;
     814    attributes.y = allocation.y;
     815    attributes.width = allocation.width;
     816    attributes.height = allocation.height;
    810817    attributes.wclass = GDK_INPUT_OUTPUT;
    811     attributes.visual = gtk_widget_get_visual (widget);
    812     attributes.colormap = gtk_widget_get_colormap (widget);
     818    attributes.visual = gtk_widget_get_visual(widget);
     819    attributes.colormap = gtk_widget_get_colormap(widget);
    813820    attributes.event_mask = GDK_VISIBILITY_NOTIFY_MASK
    814821                            | GDK_EXPOSURE_MASK
    … …  
    824831
    825832    gint attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
    826     widget->window = gdk_window_new(gtk_widget_get_parent_window (widget), &attributes, attributes_mask);
    827     gdk_window_set_user_data(widget->window, widget);
    828 
    829     widget->style = gtk_style_attach(widget->style, widget->window);
    830     gtk_style_set_background(widget->style, widget->window, GTK_STATE_NORMAL);
     833    GdkWindow* window = gdk_window_new(gtk_widget_get_parent_window(widget), &attributes, attributes_mask);
     834    gtk_widget_set_window(widget, window);
     835    gdk_window_set_user_data(window, widget);
     836
     837#if GTK_CHECK_VERSION(2, 20, 0)
     838    gtk_widget_style_attach(widget);
     839#else
     840    widget->style = gtk_style_attach(gtk_widget_get_style(widget), window);
     841#endif
     842    gtk_style_set_background(gtk_widget_get_style(widget), window, GTK_STATE_NORMAL);
    831843
    832844    WebKitWebView* webView = WEBKIT_WEB_VIEW(widget);
    833845    WebKitWebViewPrivate* priv = webView->priv;
    834     gtk_im_context_set_client_window(priv->imContext, widget->window);
     846    gtk_im_context_set_client_window(priv->imContext, window);
    835847}
    836848
    … …  
    971983        entry = gtk_entry_new();
    972984        gtk_entry_set_text(GTK_ENTRY(entry), defaultValue);
    973         gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), entry);
     985        gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), entry);
    974986        gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE);
    975987        gtk_widget_show(entry);
    … …  
    13131325
    13141326    PlatformMouseEvent platformEvent(&event->button);
    1315     frame->eventHandler()->dragSourceEndedAt(platformEvent, gdkDragActionToDragOperation(context->action));
     1327    frame->eventHandler()->dragSourceEndedAt(platformEvent, gdkDragActionToDragOperation(gdk_drag_context_get_selected_action(context)));
    13161328
    13171329    gdk_event_free(event);
    … …  
    28832895    g_object_ref_sink(priv->verticalAdjustment);
    28842896
    2885     GTK_WIDGET_SET_FLAGS(webView, GTK_CAN_FOCUS);
     2897    gtk_widget_set_can_focus(GTK_WIDGET(webView), TRUE);
    28862898    priv->mainFrame = WEBKIT_WEB_FRAME(webkit_web_frame_new(webView));
    28872899    priv->lastPopupXPosition = priv->lastPopupYPosition = -1;
Note: See TracChangeset for help on using the changeset viewer.