Changeset 149952 in webkit


Ignore:
Timestamp:
May 12, 2013 2:05:54 AM (11 years ago)
Author:
Carlos Garcia Campos
Message:

[GTK] Remove unnecessary GTK_CHECK_VERSION #ifdefs
​https://bugs.webkit.org/show_bug.cgi?id=115914

Reviewed by Martin Robinson.

Source/WebCore:

  • platform/graphics/gtk/FullscreenVideoControllerGtk.cpp:

(WebCore::FullscreenVideoControllerGtk::hideHud):
(WebCore::FullscreenVideoControllerGtk::initializeWindow):

  • platform/gtk/GtkVersioning.c:
  • platform/gtk/GtkVersioning.h:
  • platform/gtk/WidgetRenderingContext.cpp:

(WebCore::WidgetRenderingContext::WidgetRenderingContext):

  • plugins/gtk/gtk2xtbin.c:

(gtk_xtbin_realize):

Source/WebKit/gtk:

  • WebCoreSupport/ChromeClientGtk.cpp:

(WebKit::ChromeClient::contentsSizeChanged):

  • WebCoreSupport/FrameLoaderClientGtk.cpp:

(WebKit::FrameLoaderClient::transitionToCommittedForNewPage):

  • tests/testapplicationcache.c:
  • tests/testatk.c:
  • tests/testatkroles.c:

(main):

  • tests/testcontextmenu.c:
  • tests/testcopyandpaste.c:

(main):

  • tests/testdomdocument.c:
  • tests/testdomdomwindow.c:
  • tests/testdomnode.c:
  • tests/testdownload.c:

(main):

  • tests/testfavicondatabase.c:

(main):

  • tests/testglobals.c:
  • tests/testhittestresult.c:
  • tests/testhttpbackend.c:

(main):

  • tests/testkeyevents.c:

(main):

  • tests/testloading.c:
  • tests/testmimehandling.c:

(main):

  • tests/testnetworkrequest.c:

(main):

  • tests/testnetworkresponse.c:

(main):

  • tests/testwebbackforwardlist.c:

(main):

  • tests/testwebdatasource.c:

(main):

  • tests/testwebframe.c:

(main):

  • tests/testwebhistoryitem.c:

(main):

  • tests/testwebinspector.c:

(main):

  • tests/testwebplugindatabase.c:

(main):

  • tests/testwebresource.c:

(main):

  • tests/testwebsettings.c:

(main):

  • tests/testwebview.c:
  • tests/testwindow.c:

(main):

  • webkit/webkitwebview.cpp:

(webkit_web_view_realize):
(webkit_web_view_show_help):
(webkit_web_view_class_init):
(webkit_web_view_set_tooltip_text):

Source/WebKit2:

  • UIProcess/API/gtk/WebKitWebViewBase.cpp:

(webkitWebViewBaseRealize):

Tools:

  • GtkLauncher/main.c:

(createToolbar):

  • MiniBrowser/gtk/BrowserWindow.c:

(_BrowserWindow):
(browserWindowSetStatusText):
(fullScreenMessageTimeoutCallback):
(webViewEnterFullScreen):
(webViewLeaveFullScreen):
(browserWindowFinalize):
(browserWindowConstructed):

  • WebKitTestRunner/gtk/EventSenderProxyGtk.cpp:

(WTR::EventSenderProxy::mouseScrollBy):
(WTR::EventSenderProxy::continuousMouseScrollBy):

Location:
trunk
Files:
44 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r149951 r149952  
     12013-05-12  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [GTK] Remove unnecessary GTK_CHECK_VERSION #ifdefs
     4        https://bugs.webkit.org/show_bug.cgi?id=115914
     5
     6        Reviewed by Martin Robinson.
     7
     8        * platform/graphics/gtk/FullscreenVideoControllerGtk.cpp:
     9        (WebCore::FullscreenVideoControllerGtk::hideHud):
     10        (WebCore::FullscreenVideoControllerGtk::initializeWindow):
     11        * platform/gtk/GtkVersioning.c:
     12        * platform/gtk/GtkVersioning.h:
     13        * platform/gtk/WidgetRenderingContext.cpp:
     14        (WebCore::WidgetRenderingContext::WidgetRenderingContext):
     15        * plugins/gtk/gtk2xtbin.c:
     16        (gtk_xtbin_realize):
     17
    1182013-05-11  Brent Fulgham  <bfulgham@apple.com>
    219

  • trunk/Source/WebCore/platform/graphics/gtk/FullscreenVideoControllerGtk.cpp

    r142406 r149952  
    198198
    199199    GdkWindow* window = gtk_widget_get_window(m_window);
    200     GdkCursor* cursor = blankCursor();
    201     gdk_window_set_cursor(window, cursor);
     200    GRefPtr<GdkCursor> cursor = adoptGRef(gdk_cursor_new(GDK_BLANK_CURSOR));
     201    gdk_window_set_cursor(window, cursor.get());
    202202
    203203    gtk_widget_hide(m_hudWindow);
    … …  
    256256
    257257    GdkWindow* window = gtk_widget_get_window(m_window);
    258     GRefPtr<GdkCursor> cursor(adoptGRef(blankCursor()));
     258    GRefPtr<GdkCursor> cursor = adoptGRef(gdk_cursor_new(GDK_BLANK_CURSOR));
    259259    gdk_window_set_cursor(window, cursor.get());
    260260

  • trunk/Source/WebCore/platform/gtk/GtkVersioning.c

    r149879 r149952  
    2626#include <X11/Xatom.h>
    2727#include <gdk/gdkx.h>
    28 #endif
    29 
    30 #if !GTK_CHECK_VERSION(2, 14, 0)
    31 void gtk_adjustment_set_value(GtkAdjustment* adjusment, gdouble value)
    32 {
    33         m_adjustment->value = m_currentPos;
    34         gtk_adjustment_value_changed(m_adjustment);
    35 }
    36 
    37 void gtk_adjustment_configure(GtkAdjustment* adjustment, gdouble value, gdouble lower, gdouble upper,
    38                               gdouble stepIncrement, gdouble pageIncrement, gdouble pageSize)
    39 {
    40     g_object_freeze_notify(G_OBJECT(adjustment));
    41 
    42     g_object_set(adjustment,
    43                  "lower", lower,
    44                  "upper", upper,
    45                  "step-increment", stepIncrement,
    46                  "page-increment", pageIncrement,
    47                  "page-size", pageSize,
    48                  NULL);
    49 
    50     g_object_thaw_notify(G_OBJECT(adjustment));
    51 
    52     gtk_adjustment_changed(adjustment);
    53     gtk_adjustment_value_changed(adjustment);
    54 }
    5528#endif
    5629
    … …  
    6437#endif // GTK_API_VERSION_2
    6538}
    66 
    67 #if !GTK_CHECK_VERSION(2, 17, 3)
    68 void gdk_window_get_root_coords(GdkWindow* window, gint x, gint y, gint* rootX, gint* rootY)
    69 {
    70     gdk_window_get_root_origin(window, rootX, rootY);
    71     *rootX = *rootX + x;
    72     *rootY = *rootY + y;
    73 }
    74 #endif
    75 
    76 GdkCursor * blankCursor()
    77 {
    78 #if GTK_CHECK_VERSION(2, 16, 0)
    79     return gdk_cursor_new(GDK_BLANK_CURSOR);
    80 #else
    81     GdkCursor * cursor;
    82     GdkPixmap * source;
    83     GdkPixmap * mask;
    84     GdkColor foreground = { 0, 65535, 0, 0 }; // Red.
    85     GdkColor background = { 0, 0, 0, 65535 }; // Blue.
    86     static gchar cursorBits[] = {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0};
    87 
    88     source = gdk_bitmap_create_from_data(0, cursorBits, 8, 8);
    89     mask = gdk_bitmap_create_from_data(0, cursorBits, 8, 8);
    90     cursor = gdk_cursor_new_from_pixmap(source, mask, &foreground, &background, 8, 8);
    91     gdk_pixmap_unref(source);
    92     gdk_pixmap_unref(mask);
    93     return cursor;
    94 #endif // GTK_CHECK_VERSION(2, 16, 0)
    95 }
    96 
    97 #if !GTK_CHECK_VERSION(2, 16, 0)
    98 const gchar* gtk_menu_item_get_label(GtkMenuItem* menuItem)
    99 {
    100     GtkWidget * label = gtk_bin_get_child(GTK_BIN(menuItem));
    101     if (GTK_IS_LABEL(label))
    102         return gtk_label_get_text(GTK_LABEL(label));
    103     return 0;
    104 }
    105 #endif // GTK_CHECK_VERSION(2, 16, 0)
    10639
    10740#ifdef GTK_API_VERSION_2
    … …  
    267200}
    268201
    269 #if GTK_CHECK_VERSION(2, 24, 0)
    270 void getGdkDrawableSize(GdkDrawable *drawable, int *width, int *height)
    271 {
    272     g_return_if_fail(GDK_IS_PIXMAP(drawable) || GDK_IS_WINDOW(drawable));
    273 
    274     if (GDK_IS_PIXMAP(drawable)) {
    275         gdk_pixmap_get_size(GDK_PIXMAP(drawable), width, height);
    276         return;
    277     }
    278 
    279     GdkWindow *window = GDK_WINDOW(drawable);
    280     *width = gdk_window_get_width(window);
    281     *height = gdk_window_get_height(window);
    282 }
    283 #else
    284 void getGdkDrawableSize(GdkDrawable *drawable, int *width, int *height)
    285 {
    286     gdk_drawable_get_size(drawable, width, height);
    287 }
    288 #endif // GTK_CHECK_VERSION(2, 24, 0)
    289 
    290 #endif // GTK_API_VERSION_2
    291 
    292 #if !GTK_CHECK_VERSION(2, 22, 0)
    293 cairo_surface_t *gdk_window_create_similar_surface(GdkWindow *window, cairo_content_t content, int width, int height)
    294 {
    295     cairo_t *cairoContext = gdk_cairo_create(window);
    296     cairo_surface_t *cairoSurface = cairo_get_target(cairoContext);
    297     cairo_surface_t *newSurface = cairo_surface_create_similar(cairoSurface, content, width, height);
    298     cairo_destroy(cairoContext);
    299     return newSurface;
    300 }
    301 #endif // GTK_CHECK_VERSION(2, 22, 0)
    302 
    303 #if !GTK_CHECK_VERSION(3, 3, 6)
    304202#ifdef GDK_WINDOWING_X11
    305203static int getScreenCurrentDesktop(GdkScreen *screen)
    … …  
    371269#endif
    372270}
    373 #endif // GTK_CHECK_VERSION(3, 3, 6)
     271#endif // GTK_API_VERSION_2

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

    r149879 r149952  
    3737GdkPixbuf* gdk_pixbuf_get_from_surface(cairo_surface_t* surface, int srcX, int srcY,
    3838                                       int width, int height);
    39 void getGdkDrawableSize(GdkDrawable* drawable, int* width, int* height);
     39void gdk_screen_get_monitor_workarea(GdkScreen *, int monitor, GdkRectangle *area);
    4040#endif
    4141
    42 #if !GTK_CHECK_VERSION(2, 23, 4)
    43 #define gdk_pixmap_get_size gdk_drawable_get_size
    44 #endif // GTK_CHECK_VERSION(2, 23, 4)
    45 
    46 #if !GTK_CHECK_VERSION(2, 23, 0)
    47 #define gdk_window_get_display(window) gdk_drawable_get_display(window)
    48 #define gdk_window_get_visual gdk_drawable_get_visual
    49 #endif // GTK_CHECK_VERSION(2, 23, 0)
    50 
    51 #if !GTK_CHECK_VERSION(2, 22, 0)
    52 cairo_surface_t* gdk_window_create_similar_surface(GdkWindow* window, cairo_content_t content, int width, int height);
    53 #endif // GTK_CHECK_VERSION(2, 22, 0)
    54 
    55 #if !GTK_CHECK_VERSION(2, 21, 2)
    56 #define gdk_visual_get_depth(visual) (visual)->depth
    57 #define gdk_visual_get_bits_per_rgb(visual) (visual)->bits_per_rgb
    58 #define gdk_drag_context_get_selected_action(context) (context)->action
    59 #define gdk_drag_context_get_actions(context) (context)->actions
    60 #endif // GTK_CHECK_VERSION(2, 21, 2)
    61 
    62 #if !GTK_CHECK_VERSION(2, 20, 0)
    63 #define gtk_widget_get_realized(widget) GTK_WIDGET_REALIZED(widget)
    64 #define gtk_widget_set_realized(widget, TRUE) GTK_WIDGET_SET_FLAGS((widget), GTK_REALIZED)
    65 #define gtk_range_get_min_slider_size(range) (range)->min_slider_size
    66 #endif // GTK_CHECK_VERSION(2, 20, 0)
    67 
    68 #if !GTK_CHECK_VERSION(2, 19, 0)
    69 #define gtk_widget_is_toplevel(widget) GTK_WIDGET_TOPLEVEL(widget)
    70 #define gtk_widget_get_realized(widget) GTK_WIDGET_REALIZED(widget)
    71 #define gtk_widget_get_has_window(widget) !GTK_WIDGET_NO_WINDOW(widget)
    72 #define gtk_widget_get_can_focus(widget) GTK_WIDGET_CAN_FOCUS(widget)
    73 #define gtk_widget_is_sensitive(widget) GTK_WIDGET_IS_SENSITIVE(widget)
    74 #endif // GTK_CHECK_VERSION(2, 19, 0)
    75 
    76 #if !GTK_CHECK_VERSION(2, 18, 0)
    77 #define gtk_widget_set_visible(widget, FALSE) GTK_WIDGET_UNSET_FLAGS((widget), GTK_VISIBLE)
    78 #define gtk_widget_get_visible(widget) (GTK_WIDGET_FLAGS(widget) & GTK_VISIBLE)
    79 
    80 #define gtk_widget_set_window(widget, new_window) (widget)->window = (new_window)
    81 #define gtk_widget_set_can_focus(widget, TRUE) GTK_WIDGET_SET_FLAGS((widget), GTK_CAN_FOCUS)
    82 #define gtk_widget_get_allocation(widget, alloc) (*(alloc) = (widget)->allocation)
    83 #define gtk_widget_set_allocation(widget, alloc) ((widget)->allocation = *(alloc))
    84 #endif // GTK_CHECK_VERSION(2, 18, 0)
    85 
    86 #if !GTK_CHECK_VERSION(2, 17, 3)
    87 void gdk_window_get_root_coords(GdkWindow* window, gint x, gint y, gint* rootX, gint* rootY);
    88 #endif // GTK_CHECK_VERSION(2, 17, 3)
    89 
    90 #if !GTK_CHECK_VERSION(2, 16, 0)
    91 const gchar* gtk_menu_item_get_label(GtkMenuItem*);
    92 #endif // GTK_CHECK_VERSION(2, 16, 0)
    93 
    94 
    95 #if !GTK_CHECK_VERSION(2, 14, 0)
    96 #define gtk_widget_get_window(widget) (widget)->window
    97 #define gtk_adjustment_get_value(adj) (adj)->value
    98 #define gtk_dialog_get_content_area(dialog) (dialog)->vbox
    99 #define gtk_dialog_get_action_area(dialog) (dialog)->action_area
    100 #define gtk_selection_data_get_length(data) (data)->length
    101 #define gtk_selection_data_get_data(data) (data)->data
    102 #define gtk_selection_data_get_target(data) (data)->target
    103 #define gtk_adjustment_set_page_size(adj, newValue) ((adj)->page_size = newValue)
    104 #define gtk_adjustment_set_value(adj, newValue) ((adj)->value = newValue)
    105 #define gtk_adjustment_set_lower(adj, newValue) ((adj)->lower = newValue)
    106 #define gtk_adjustment_set_upper(adj, newValue) ((adj)->upper = newValue)
    107 
    108 void gtk_adjustment_configure(GtkAdjustment* adjustment, gdouble value, gdouble lower, gdouble upper,
    109                               gdouble stepIncrement, gdouble pageIncrement, gdouble pageSize);
    110 
    111 void gtk_adjustment_set_value(GtkAdjustment* adjusment, gdouble value);
    112 #endif // GTK_CHECK_VERSION(2, 14, 0)
    113 
    11442GdkDevice* getDefaultGDKPointerDevice(GdkWindow* window);
    115 GdkCursor* blankCursor();
    116 
    117 #if !GTK_CHECK_VERSION(3, 3, 6)
    118 void gdk_screen_get_monitor_workarea(GdkScreen *, int monitor, GdkRectangle *area);
    119 #endif
    12043
    12144G_END_DECLS

  • trunk/Source/WebCore/platform/gtk/WidgetRenderingContext.cpp

    r143973 r149952  
    8686    // This prevents giant pixmap allocations for very large widgets in smaller views.
    8787    // FIXME: We need to implement this check for WebKit2 as well.
    88     if (graphicsContext->gdkWindow()) {
     88    if (GdkDrawable* drawable = graphicsContext->gdkWindow()) {
    8989        int maxWidth = 0, maxHeight = 0;
    90         getGdkDrawableSize(graphicsContext->gdkWindow(), &maxWidth, &maxHeight);
     90
     91        if (GDK_IS_PIXMAP(drawable))
     92            gdk_pixmap_get_size(GDK_PIXMAP(drawable), &maxWidth, &maxHeight);
     93        else if (GDK_IS_WINDOW(drawable)) {
     94            maxWidth = gdk_window_get_width(GDK_WINDOW(drawable));
     95            maxHeight = gdk_window_get_height(GDK_WINDOW(drawable));
     96        }
    9197        m_targetRect.setSize(m_targetRect.size().shrunkTo(IntSize(maxWidth, maxHeight)));
    9298    }

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

    r124318 r149952  
    274274  GtkXtBin     *xtbin;
    275275  GtkAllocation allocation = { 0, 0, 200, 200 };
    276 #if GTK_CHECK_VERSION(2, 18, 0)
    277276  GtkAllocation widget_allocation;
    278 #endif
    279277
    280278#ifdef DEBUG_XTBIN
    … …  
    287285
    288286  /* caculate the allocation before realize */
    289 #if GTK_CHECK_VERSION(2, 24, 0)
    290287  allocation.width = gdk_window_get_width(xtbin->parent_window);
    291288  allocation.height = gdk_window_get_height(xtbin->parent_window);
    292 #else
    293   gint  x, y, w, h, d; /* geometry of window */
    294   gdk_window_get_geometry(xtbin->parent_window, &x, &y, &w, &h, &d);
    295   allocation.width = w;
    296   allocation.height = h;
    297 #endif
    298289  gtk_widget_size_allocate (widget, &allocation);
    299290
    … …  
    302293#endif
    303294
    304 #if GTK_CHECK_VERSION(2, 18, 0)
    305295  gtk_widget_get_allocation(widget, &widget_allocation);
    306296  xtbin->width = widget_allocation.width;
    307297  xtbin->height = widget_allocation.height;
    308 #else
    309   xtbin->width = widget->allocation.width;
    310   xtbin->height = widget->allocation.height;
    311 #endif
    312298
    313299  /* use GtkSocket's realize */

  • trunk/Source/WebKit/gtk/ChangeLog

    r149666 r149952  
     12013-05-12  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [GTK] Remove unnecessary GTK_CHECK_VERSION #ifdefs
     4        https://bugs.webkit.org/show_bug.cgi?id=115914
     5
     6        Reviewed by Martin Robinson.
     7
     8        * WebCoreSupport/ChromeClientGtk.cpp:
     9        (WebKit::ChromeClient::contentsSizeChanged):
     10        * WebCoreSupport/FrameLoaderClientGtk.cpp:
     11        (WebKit::FrameLoaderClient::transitionToCommittedForNewPage):
     12        * tests/testapplicationcache.c:
     13        * tests/testatk.c:
     14        * tests/testatkroles.c:
     15        (main):
     16        * tests/testcontextmenu.c:
     17        * tests/testcopyandpaste.c:
     18        (main):
     19        * tests/testdomdocument.c:
     20        * tests/testdomdomwindow.c:
     21        * tests/testdomnode.c:
     22        * tests/testdownload.c:
     23        (main):
     24        * tests/testfavicondatabase.c:
     25        (main):
     26        * tests/testglobals.c:
     27        * tests/testhittestresult.c:
     28        * tests/testhttpbackend.c:
     29        (main):
     30        * tests/testkeyevents.c:
     31        (main):
     32        * tests/testloading.c:
     33        * tests/testmimehandling.c:
     34        (main):
     35        * tests/testnetworkrequest.c:
     36        (main):
     37        * tests/testnetworkresponse.c:
     38        (main):
     39        * tests/testwebbackforwardlist.c:
     40        (main):
     41        * tests/testwebdatasource.c:
     42        (main):
     43        * tests/testwebframe.c:
     44        (main):
     45        * tests/testwebhistoryitem.c:
     46        (main):
     47        * tests/testwebinspector.c:
     48        (main):
     49        * tests/testwebplugindatabase.c:
     50        (main):
     51        * tests/testwebresource.c:
     52        (main):
     53        * tests/testwebsettings.c:
     54        (main):
     55        * tests/testwebview.c:
     56        * tests/testwindow.c:
     57        (main):
     58        * webkit/webkitwebview.cpp:
     59        (webkit_web_view_realize):
     60        (webkit_web_view_show_help):
     61        (webkit_web_view_class_init):
     62        (webkit_web_view_set_tooltip_text):
     63
    1642013-05-07  Tomas Popela  <tpopela@redhat.com>
    265

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

    r149125 r149952  
    721721    GtkWidget* widget = GTK_WIDGET(m_webView);
    722722    GtkRequisition requisition;
    723 #if GTK_CHECK_VERSION(2, 20, 0)
    724723    gtk_widget_get_requisition(widget, &requisition);
    725 #else
    726     requisition = widget->requisition;
    727 #endif
    728724    if (gtk_widget_get_realized(widget)
    729725        && (requisition.height != size.height())

  • trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp

    r148294 r149952  
    12511251    WebKitWebView* containingWindow = getViewFromFrame(m_frame);
    12521252    GtkAllocation allocation;
    1253 #if GTK_CHECK_VERSION(2, 18, 0)
    12541253    gtk_widget_get_allocation(GTK_WIDGET(containingWindow), &allocation);
    1255 #else
    1256     allocation = GTK_WIDGET(containingWindow)->allocation;
    1257 #endif
    12581254    IntSize size = IntSize(allocation.width, allocation.height);
    12591255    bool transparent = webkit_web_view_get_transparent(containingWindow);

  • trunk/Source/WebKit/gtk/tests/testapplicationcache.c

    r143869 r149952  
    2424#include <webkit/webkit.h>
    2525
    26 #if GTK_CHECK_VERSION(2, 14, 0)
    27 
    2826static void test_application_cache_maximum_size()
    2927{
    … …  
    5048}
    5149
    52 #else
    53 int main(int argc, char** argv)
    54 {
    55     g_critical("You will need gtk-2.14.0 to run the unit tests. Doing nothing now.");
    56     return 0;
    57 }
    58 
    59 #endif

  • trunk/Source/WebKit/gtk/tests/testatk.c

    r143869 r149952  
    2626#include <unistd.h>
    2727#include <webkit/webkit.h>
    28 
    29 #if GTK_CHECK_VERSION(2, 14, 0)
    3028
    3129static const char* centeredContents = "<html><body><p style='text-align: center;'>Short line</p><p style='text-align: center;'>Long-size line with some foo bar baz content</p><p style='text-align: center;'>Short line</p><p style='text-align: center;'>This is a multi-line paragraph<br />where the first line<br />is the biggest one</p></body></html>";
    … …  
    20312029}
    20322030
    2033 #else
    2034 int main(int argc, char** argv)
    2035 {
    2036     g_critical("You will need gtk-2.14.0 to run the unit tests. Doing nothing now.");
    2037     return 0;
    2038 }
    2039 
    2040 #endif

  • trunk/Source/WebKit/gtk/tests/testatkroles.c

    r143869 r149952  
    2525#include <webkit/webkit.h>
    2626
    27 #if GTK_CHECK_VERSION(2, 14, 0)
    28 
    2927/* Non form roles */
    3028#define HTML_DOCUMENT_FRAME "<html><body>This is a test.</body></html>"
    … …  
    427425    return g_test_run();
    428426}
    429 
    430 #else
    431 int main(int argc, char** argv)
    432 {
    433     g_critical("You will need gtk-2.14.0 to run the unit tests. Doing nothing now.");
    434     return 0;
    435 }
    436 
    437 #endif

  • trunk/Source/WebKit/gtk/tests/testcontextmenu.c

    r143869 r149952  
    2020#include "autotoolsconfig.h"
    2121#include <webkit/webkit.h>
    22 
    23 #if GTK_CHECK_VERSION(2, 14, 0)
    2422
    2523typedef struct {
    … …  
    315313}
    316314
    317 #else
    318 
    319 int main(int argc, char **argv)
    320 {
    321     g_critical("You will need at least GTK+ 2.14.0 to run the unit tests.");
    322     return 0;
    323 }
    324 
    325 #endif

  • trunk/Source/WebKit/gtk/tests/testcopyandpaste.c

    r143869 r149952  
    2727#include <JavaScriptCore/JSContextRef.h>
    2828
    29 #if GTK_CHECK_VERSION(2, 14, 0)
    30 
    3129typedef struct {
    3230    char* page;
    … …  
    267265    return g_test_run();
    268266}
    269 
    270 #else
    271 
    272 int main(int argc, char** argv)
    273 {
    274     g_critical("You will need at least GTK+ 2.14.0 to run the unit tests.");
    275     return 0;
    276 }
    277 
    278 #endif

  • trunk/Source/WebKit/gtk/tests/testdomdocument.c

    r146721 r149952  
    2626#include <webkit/webkit.h>
    2727
    28 #if GTK_CHECK_VERSION(2, 14, 0)
    29 
    3028#define HTML_DOCUMENT_TITLE "<html><head><title>This is the title</title></head><body></body></html>"
    3129#define HTML_DOCUMENT_ELEMENTS "<html><body><ul><li>1</li><li>2</li><li>3</li></ul></body></html>"
    … …  
    392390}
    393391
    394 #else
    395 int main(int argc, char** argv)
    396 {
    397     g_critical("You will gtk-2.14.0 to run the unit tests. Doing nothing now.");
    398     return 0;
    399 }
    400 
    401 #endif

  • trunk/Source/WebKit/gtk/tests/testdomdomwindow.c

    r143869 r149952  
    2626#include <webkit/webkit.h>
    2727
    28 #if GTK_CHECK_VERSION(2, 14, 0)
    29 
    3028#define HTML_DOCUMENT "<html><head><title>This is the title</title></head><body><p id='test'>test</p></body></html>"
    3129
    … …  
    218216}
    219217
    220 #else
    221 int main(int argc, char** argv)
    222 {
    223     g_critical("You will need gtk-2.14.0 to run the unit tests. Doing nothing now.");
    224     return 0;
    225 }
    226 
    227 #endif

  • trunk/Source/WebKit/gtk/tests/testdomnode.c

    r143869 r149952  
    2525#include <gtk/gtk.h>
    2626#include <webkit/webkit.h>
    27 
    28 #if GTK_CHECK_VERSION(2, 14, 0)
    2927
    3028#define HTML_DOCUMENT_HIERARCHY_NAVIGATION "<html><head><title>This is the title</title></head><body><p>1</p><p>2</p><p>3</p></body></html>"
    … …  
    195193}
    196194
    197 #else
    198 int main(int argc, char** argv)
    199 {
    200     g_critical("You will need gtk-2.14.0 to run the unit tests. Doing nothing now.");
    201     return 0;
    202 }
    203 
    204 #endif

  • trunk/Source/WebKit/gtk/tests/testdownload.c

    r143869 r149952  
    2424#include <webkit/webkit.h>
    2525
    26 #if GTK_CHECK_VERSION(2, 14, 0)
    27 
    2826GMainLoop* loop;
    2927char* temporaryFilename = NULL;
    … …  
    323321    return g_test_run ();
    324322}
    325 
    326 #else
    327 
    328 int main(int argc, char** argv)
    329 {
    330     g_critical("You will need at least GTK+ 2.14.0 to run the unit tests.");
    331     return 0;
    332 }
    333 
    334 #endif

  • trunk/Source/WebKit/gtk/tests/testfavicondatabase.c

    r143869 r149952  
    2727const int gIconSize = 16;
    2828
    29 #if GTK_CHECK_VERSION(2, 14, 0)
    3029GMainLoop *loop;
    3130char *baseURI;
    … …  
    276275    return g_test_run();
    277276}
    278 #else
    279 int main(int argc, char **argv)
    280 {
    281     g_critical("You will need gtk-2.14.0 to run the unit tests. Doing nothing now.");
    282     return 0;
    283 }
    284 
    285 #endif

  • trunk/Source/WebKit/gtk/tests/testglobals.c

    r143869 r149952  
    2222#include <libsoup/soup.h>
    2323#include <webkit/webkit.h>
    24 
    25 #if GTK_CHECK_VERSION(2, 14, 0)
    2624
    2725// Make sure the session is initialized properly when webkit_get_default_session() is called.
    … …  
    111109}
    112110
    113 #else
    114 int main(int argc, char** argv)
    115 {
    116     g_critical("You will need gtk-2.14.0 to run the unit tests. Doing nothing now.");
    117     return 0;
    118 }
    119 
    120 #endif

  • trunk/Source/WebKit/gtk/tests/testhittestresult.c

    r143869 r149952  
    2323#include <glib/gstdio.h>
    2424#include <webkit/webkit.h>
    25 
    26 #if GTK_CHECK_VERSION(2, 14, 0)
    2725
    2826typedef struct {
    … …  
    170168}
    171169
    172 #else
    173 
    174 int main(int argc, char** argv)
    175 {
    176     g_critical("You will need at least GTK+ 2.14.0 to run the unit tests.");
    177     return 0;
    178 }
    179 
    180 #endif

  • trunk/Source/WebKit/gtk/tests/testhttpbackend.c

    r143869 r149952  
    2525#include <gtk/gtk.h>
    2626#include <webkit/webkit.h>
    27 
    28 #if GTK_CHECK_VERSION(2, 14, 0)
    2927
    3028// Not yet public API
    … …  
    7674    return g_test_run ();
    7775}
    78 
    79 #else
    80 int main(int argc, char** argv)
    81 {
    82     g_critical("You will need gtk-2.14.0 to run the unit tests. Doing nothing now.");
    83     return 0;
    84 }
    85 
    86 #endif

  • trunk/Source/WebKit/gtk/tests/testkeyevents.c

    r143869 r149952  
    2727#include <JavaScriptCore/JSContextRef.h>
    2828
    29 
    30 #if GTK_CHECK_VERSION(2, 14, 0)
    31 
    3229typedef struct {
    3330    char* page;
    … …  
    252249}
    253250
    254 #if defined(GDK_WINDOWING_X11) && GTK_CHECK_VERSION(2, 16, 0)
     251#if defined(GDK_WINDOWING_X11)
    255252static void test_xim_load_status_cb(WebKitWebView* webView, GParamSpec* spec, gpointer data)
    256253{
    … …  
    376373               test_blocking,
    377374               key_event_fixture_teardown);
    378 #if defined(GDK_WINDOWING_X11) && GTK_CHECK_VERSION(2, 16, 0)
     375#if defined(GDK_WINDOWING_X11)
    379376    g_test_add("/webkit/keyevent/xim-textinput", KeyEventFixture,
    380377               test_info_new(textinput_html, TRUE),
    … …  
    392389}
    393390
    394 #else
    395 
    396 int main(int argc, char** argv)
    397 {
    398     g_critical("You will need at least GTK+ 2.14.0 to run the unit tests.");
    399     return 0;
    400 }
    401 
    402 #endif

  • trunk/Source/WebKit/gtk/tests/testloading.c

    r143869 r149952  
    2424#include <string.h>
    2525#include <webkit/webkit.h>
    26 
    27 #if GTK_CHECK_VERSION(2, 14, 0)
    2826
    2927/* This string has to be rather big because of the cancelled test - it
    … …  
    436434}
    437435
    438 #else
    439 int main(int argc, char** argv)
    440 {
    441     g_critical("You will need gtk-2.14.0 to run the unit tests. Doing nothing now.");
    442     return 0;
    443 }
    444 
    445 #endif

  • trunk/Source/WebKit/gtk/tests/testmimehandling.c

    r143869 r149952  
    2929#include <unistd.h>
    3030
    31 #if GTK_CHECK_VERSION(2, 14, 0)
    32 
    3331GMainLoop* loop;
    3432SoupSession *session;
    … …  
    204202    return g_test_run();
    205203}
    206 
    207 #else
    208 int main(int argc, char** argv)
    209 {
    210     g_critical("You will need gtk-2.14.0 to run the unit tests. Doing nothing now.");
    211     return 0;
    212 }
    213 
    214 #endif

  • trunk/Source/WebKit/gtk/tests/testnetworkrequest.c

    r143869 r149952  
    2626#include <stdlib.h>
    2727#include <webkit/webkit.h>
    28 
    29 #if GTK_CHECK_VERSION(2, 14, 0)
    3028
    3129static void test_network_request_create_destroy()
    … …  
    9795    return g_test_run ();
    9896}
    99 
    100 #else
    101 int main(int argc, char** argv)
    102 {
    103     g_critical("You will need gtk-2.14.0 to run the unit tests. Doing nothing now.");
    104     return 0;
    105 }
    106 
    107 #endif

  • trunk/Source/WebKit/gtk/tests/testnetworkresponse.c

    r143869 r149952  
    2727#include <stdlib.h>
    2828#include <webkit/webkit.h>
    29 
    30 #if GTK_CHECK_VERSION(2, 14, 0)
    3129
    3230static void test_network_response_create_destroy()
    … …  
    9896    return g_test_run ();
    9997}
    100 
    101 #else
    102 int main(int argc, char** argv)
    103 {
    104     g_critical("You will need gtk-2.14.0 to run the unit tests. Doing nothing now.");
    105     return 0;
    106 }
    107 
    108 #endif

  • trunk/Source/WebKit/gtk/tests/testwebbackforwardlist.c

    r143869 r149952  
    2323#include <webkit/webkit.h>
    2424
    25 #if GTK_CHECK_VERSION(2, 14, 0)
    26 
    2725static void test_webkit_web_history_item_lifetime(void)
    2826{
    … …  
    327325    return g_test_run ();
    328326}
    329 
    330 #else
    331 int main(int argc, char** argv)
    332 {
    333     g_critical("You will need gtk-2.14.0 to run the unit tests. Doing nothing now.");
    334     return 0;
    335 }
    336 
    337 #endif

  • trunk/Source/WebKit/gtk/tests/testwebdatasource.c

    r143869 r149952  
    2323#include <webkit/webkit.h>
    2424
    25 #if GTK_CHECK_VERSION(2, 14, 0)
    26 
    2725static const gshort defaultTimeout = 10;
    2826guint waitTimer;
    … …  
    243241    return g_test_run ();
    244242}
    245 
    246 #else
    247 int main(int argc, char** argv)
    248 {
    249     g_critical("You will need gtk-2.14.0 to run the unit tests. Doing nothing now.");
    250     return 0;
    251 }
    252 
    253 #endif

  • trunk/Source/WebKit/gtk/tests/testwebframe.c

    r143869 r149952  
    2727#include <webkit/webkit.h>
    2828
    29 #if GTK_CHECK_VERSION(2, 14, 0)
    30 
    3129static int numberOfFramesCreated = 0;
    3230
    … …  
    221219    return g_test_run ();
    222220}
    223 
    224 #else
    225 int main(int argc, char** argv)
    226 {
    227     g_critical("You will need gtk-2.14.0 to run the unit tests. Doing nothing now.");
    228     return 0;
    229 }
    230 
    231 #endif

  • trunk/Source/WebKit/gtk/tests/testwebhistoryitem.c

    r143869 r149952  
    2222#include <gtk/gtk.h>
    2323#include <webkit/webkit.h>
    24 
    25 #if GTK_CHECK_VERSION(2, 14, 0)
    2624
    2725typedef struct {
    … …  
    7169    return g_test_run ();
    7270}
    73 
    74 #else
    75 int main(int argc, char** argv)
    76 {
    77     g_critical("You will need gtk-2.14.0 to run the unit tests. Doing nothing now.");
    78     return 0;
    79 }
    80 
    81 #endif

  • trunk/Source/WebKit/gtk/tests/testwebinspector.c

    r143869 r149952  
    2525#include <gtk/gtk.h>
    2626#include <webkit/webkit.h>
    27 
    28 #if GTK_CHECK_VERSION(2, 14, 0)
    2927
    3028GMainLoop *loop;
    … …  
    173171    return g_test_run();
    174172}
    175 
    176 #else
    177 int main(int argc, char** argv)
    178 {
    179     g_critical("You will need gtk-2.14.0 to run the unit tests. Doing nothing now.");
    180     return 0;
    181 }
    182 
    183 #endif

  • trunk/Source/WebKit/gtk/tests/testwebplugindatabase.c

    r143869 r149952  
    2424#include <gtk/gtk.h>
    2525#include <webkit/webkit.h>
    26 
    27 #if GTK_CHECK_VERSION(2, 14, 0)
    2826
    2927/* This function is not public, so we need an extern declaration */
    … …  
    7977    return g_test_run ();
    8078}
    81 
    82 #else
    83 int main(int argc, char** argv)
    84 {
    85     g_critical("You will need at least gtk-2.14.0 to run the unit tests. Doing nothing now.");
    86     return 0;
    87 }
    88 
    89 #endif

  • trunk/Source/WebKit/gtk/tests/testwebresource.c

    r143869 r149952  
    2525#include <webkit/webkit.h>
    2626
    27 #if GTK_CHECK_VERSION(2, 14, 0)
    28 
    2927#define INDEX_HTML "<html></html>"
    3028#define MAIN_HTML "<html><head><script language=\"javascript\" src=\"/javascript.js\"></script></head><body><h1>hah</h1></html>"
    … …  
    332330    return g_test_run ();
    333331}
    334 
    335 #else
    336 int main(int argc, char** argv)
    337 {
    338     g_critical("You will need gtk-2.14.0 to run the unit tests. Doing nothing now.");
    339     return 0;
    340 }
    341 
    342 #endif

  • trunk/Source/WebKit/gtk/tests/testwebsettings.c

    r143869 r149952  
    2222#include <gtk/gtk.h>
    2323#include <webkit/webkit.h>
    24 
    25 #if GTK_CHECK_VERSION(2, 14, 0)
    2624
    2725/* Private API */
    … …  
    154152    return g_test_run ();
    155153}
    156 
    157 #else
    158 int main(int argc, char **argv)
    159 {
    160     g_critical("You will need gtk-2.14.0 to run the unit tests. Doing nothing now.");
    161     return 0;
    162 }
    163 
    164 #endif

  • trunk/Source/WebKit/gtk/tests/testwebview.c

    r143869 r149952  
    3434#include <webkit/webkit.h>
    3535
    36 #if GTK_CHECK_VERSION(2, 14, 0)
    37 
    3836GMainLoop* loop;
    3937SoupSession *session;
    … …  
    725723    return g_test_run ();
    726724}
    727 
    728 #else
    729 int main(int argc, char** argv)
    730 {
    731     g_critical("You will need gtk-2.14.0 to run the unit tests. Doing nothing now.");
    732     return 0;
    733 }
    734 
    735 #endif

  • trunk/Source/WebKit/gtk/tests/testwindow.c

    r143869 r149952  
    2121#include <gtk/gtk.h>
    2222#include <webkit/webkit.h>
    23 
    24 #if GTK_CHECK_VERSION(2, 14, 0)
    2523
    2624static void notify_load_status_cb(WebKitWebView* web_view, GParamSpec* pspec, gpointer data)
    … …  
    120118    return g_test_run ();
    121119}
    122 
    123 #else
    124 int main(int argc, char** argv)
    125 {
    126     g_critical("You will need gtk-2.14.0 to run the unit tests. Doing nothing now.");
    127     return 0;
    128 }
    129 
    130 #endif

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

    r149371 r149952  
    964964
    965965    GtkAllocation allocation;
    966 #if GTK_CHECK_VERSION(2, 18, 0)
    967966    gtk_widget_get_allocation(widget, &allocation);
    968 #else
    969     allocation = widget->allocation;
    970 #endif
    971967
    972968    GdkWindowAttr attributes;
    … …  
    10071003
    10081004#ifdef GTK_API_VERSION_2
    1009 #if GTK_CHECK_VERSION(2, 20, 0)
    10101005    gtk_widget_style_attach(widget);
    1011 #else
    1012     widget->style = gtk_style_attach(gtk_widget_get_style(widget), window);
    1013 #endif
    10141006    gtk_style_set_background(gtk_widget_get_style(widget), window, GTK_STATE_NORMAL);
    10151007#else
    … …  
    15881580#endif // ENABLE(DRAG_SUPPORT)
    15891581
    1590 #if GTK_CHECK_VERSION(2, 12, 0)
    15911582static gboolean webkit_web_view_query_tooltip(GtkWidget *widget, gint x, gint y, gboolean keyboard_mode, GtkTooltip *tooltip)
    15921583{
    … …  
    16451636    return GTK_WIDGET_CLASS(webkit_web_view_parent_class)->show_help(widget, help_type);
    16461637}
    1647 #endif
    16481638
    16491639static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass)
    … …  
    31183108    widgetClass->drag_data_received = NULL;
    31193109#endif
    3120 #if GTK_CHECK_VERSION(2, 12, 0)
    31213110    widgetClass->query_tooltip = webkit_web_view_query_tooltip;
    31223111    widgetClass->show_help = webkit_web_view_show_help;
    3123 #endif
    31243112    widgetClass->map = webkitWebViewMap;
    31253113
    … …  
    52925280void webkit_web_view_set_tooltip_text(WebKitWebView* webView, const char* tooltip)
    52935281{
    5294 #if GTK_CHECK_VERSION(2, 12, 0)
    52955282    WebKitWebViewPrivate* priv = webView->priv;
    52965283    if (tooltip && *tooltip != '\0') {
    … …  
    53035290
    53045291    gtk_widget_trigger_tooltip_query(GTK_WIDGET(webView));
    5305 #else
    5306     // TODO: Support older GTK+ versions
    5307     // See http://bugs.webkit.org/show_bug.cgi?id=15793
    5308     notImplemented();
    5309 #endif
    53105292}
    53115293

  • trunk/Source/WebKit2/ChangeLog

    r149945 r149952  
     12013-05-12  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [GTK] Remove unnecessary GTK_CHECK_VERSION #ifdefs
     4        https://bugs.webkit.org/show_bug.cgi?id=115914
     5
     6        Reviewed by Martin Robinson.
     7
     8        * UIProcess/API/gtk/WebKitWebViewBase.cpp:
     9        (webkitWebViewBaseRealize):
     10
    1112013-05-12  Raphael Kubo da Costa  <raphael.kubo.da.costa@intel.com>
    212

  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp

    r148351 r149952  
    246246        | GDK_BUTTON_RELEASE_MASK
    247247        | GDK_SCROLL_MASK
    248 #if GTK_CHECK_VERSION(3, 3, 18)
    249248        | GDK_SMOOTH_SCROLL_MASK
    250 #endif
    251249        | GDK_POINTER_MOTION_MASK
    252250        | GDK_KEY_PRESS_MASK

  • trunk/Tools/ChangeLog

    r149933 r149952  
     12013-05-12  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [GTK] Remove unnecessary GTK_CHECK_VERSION #ifdefs
     4        https://bugs.webkit.org/show_bug.cgi?id=115914
     5
     6        Reviewed by Martin Robinson.
     7
     8        * GtkLauncher/main.c:
     9        (createToolbar):
     10        * MiniBrowser/gtk/BrowserWindow.c:
     11        (_BrowserWindow):
     12        (browserWindowSetStatusText):
     13        (fullScreenMessageTimeoutCallback):
     14        (webViewEnterFullScreen):
     15        (webViewLeaveFullScreen):
     16        (browserWindowFinalize):
     17        (browserWindowConstructed):
     18        * WebKitTestRunner/gtk/EventSenderProxyGtk.cpp:
     19        (WTR::EventSenderProxy::mouseScrollBy):
     20        (WTR::EventSenderProxy::continuousMouseScrollBy):
     21
    1222013-05-11  Anders Carlsson  <andersca@apple.com>
    223

  • trunk/Tools/GtkLauncher/main.c

    r146019 r149952  
    265265    GtkWidget *toolbar = gtk_toolbar_new();
    266266
    267 #if GTK_CHECK_VERSION(2, 15, 0)
    268267    gtk_orientable_set_orientation(GTK_ORIENTABLE(toolbar), GTK_ORIENTATION_HORIZONTAL);
    269 #else
    270     gtk_toolbar_set_orientation(GTK_TOOLBAR(toolbar), GTK_ORIENTATION_HORIZONTAL);
    271 #endif
    272268    gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_BOTH_HORIZ);
    273269

  • trunk/Tools/MiniBrowser/gtk/BrowserWindow.c

    r147624 r149952  
    5353    GtkWidget *downloadsBar;
    5454    GdkPixbuf *favicon;
    55 #if GTK_CHECK_VERSION(3, 2, 0)
    5655    GtkWidget *fullScreenMessageLabel;
    5756    guint fullScreenMessageLabelId;
    58 #endif
    5957};
    6058
    … …  
    9290static void browserWindowSetStatusText(BrowserWindow *window, const char *text)
    9391{
    94 #if GTK_CHECK_VERSION(3, 2, 0)
    9592    gtk_label_set_text(GTK_LABEL(window->statusLabel), text);
    9693    gtk_widget_set_visible(window->statusLabel, !!text);
    97 #endif
    9894}
    9995
    … …  
    287283}
    288284
    289 #if GTK_CHECK_VERSION(3, 2, 0)
    290285static gboolean fullScreenMessageTimeoutCallback(BrowserWindow *window)
    291286{
    … …  
    294289    return FALSE;
    295290}
    296 #endif
    297291
    298292static gboolean webViewEnterFullScreen(WebKitWebView *webView, BrowserWindow *window)
    299293{
    300 #if GTK_CHECK_VERSION(3, 2, 0)
    301294    gchar *titleOrURI = g_strdup(webkit_web_view_get_title(window->webView));
    302295    if (!titleOrURI)
    … …  
    310303
    311304    window->fullScreenMessageLabelId = g_timeout_add_seconds(2, (GSourceFunc)fullScreenMessageTimeoutCallback, window);
    312 #endif
    313 
    314305    gtk_widget_hide(window->toolbar);
    315306
    … …  
    319310static gboolean webViewLeaveFullScreen(WebKitWebView *webView, BrowserWindow *window)
    320311{
    321 #if GTK_CHECK_VERSION(3, 2, 0)
    322312    if (window->fullScreenMessageLabelId) {
    323313        g_source_remove(window->fullScreenMessageLabelId);
    … …  
    325315    }
    326316    gtk_widget_hide(window->fullScreenMessageLabel);
    327 #endif
    328 
    329317    gtk_widget_show(window->toolbar);
    330318
    … …  
    467455    }
    468456
    469 #if GTK_CHECK_VERSION(3, 2, 0)
    470457    if (window->fullScreenMessageLabelId)
    471458        g_source_remove(window->fullScreenMessageLabelId);
    472 #endif
    473459
    474460    G_OBJECT_CLASS(browser_window_parent_class)->finalize(gObject);
    … …  
    597583    g_signal_connect(backForwadlist, "changed", G_CALLBACK(backForwadlistChanged), window);
    598584
    599 #if GTK_CHECK_VERSION(3, 2, 0)
    600585    GtkWidget *overlay = gtk_overlay_new();
    601586    gtk_box_pack_start(GTK_BOX(window->mainBox), overlay, TRUE, TRUE, 0);
    … …  
    618603    gtk_widget_set_no_show_all(window->fullScreenMessageLabel, TRUE);
    619604    gtk_overlay_add_overlay(GTK_OVERLAY(overlay), window->fullScreenMessageLabel);
    620 #else
    621     gtk_box_pack_start(GTK_BOX(window->mainBox), GTK_WIDGET(window->webView), TRUE, TRUE, 0);
    622 #endif
    623605    gtk_widget_show(GTK_WIDGET(window->webView));
    624606}

  • trunk/Tools/WebKitTestRunner/gtk/EventSenderProxyGtk.cpp

    r133676 r149952  
    388388
    389389    // For more than one tick in a scroll, we need smooth scroll event
    390 #if GTK_CHECK_VERSION(3, 3, 18)
    391390    if ((horizontal && vertical) || horizontal > 1 || horizontal < -1 || vertical > 1 || vertical < -1) {
    392391        event->scroll.direction = GDK_SCROLL_SMOOTH;
    … …  
    397396        return;
    398397    }
    399 #endif
    400398
    401399    if (horizontal < 0)
    … …  
    418416    g_return_if_fail(!paged);
    419417
    420 #if GTK_CHECK_VERSION(3, 3, 18)
    421418    GdkEvent* event = gdk_event_new(GDK_SCROLL);
    422419    event->scroll.x = m_position.x;
    … …  
    432429
    433430    sendOrQueueEvent(event);
    434 #endif
    435431}
    436432
Note: See TracChangeset for help on using the changeset viewer.