<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[42199] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/42199">42199</a></dd>
<dt>Author</dt> <dd>kov@webkit.org</dd>
<dt>Date</dt> <dd>2009-04-03 06:00:35 -0700 (Fri, 03 Apr 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>2009-04-03  Gustavo Noronha Silva  &lt;gustavo.noronha@collabora.co.uk&gt;

        Reviewed by Holger Freyther.

        Require GTK+ &gt;= 2.10; 2.8 is already very old, and some very
        useful APIs are only available since 2.10.

        * configure.ac:

WebCore/

2009-04-03  Gustavo Noronha Silva  &lt;gustavo.noronha@collabora.co.uk&gt;

        Reviewed by Holger Freyther.

        Remove pre-processor checks for GTK+ &gt;= 2.10, since we now require
        at least that version.

        * platform/graphics/gtk/FontPlatformDataGtk.cpp:
        (WebCore::FontPlatformData::FontPlatformData):
        * platform/gtk/ContextMenuItemGtk.cpp:
        (WebCore::gtkStockIDFromContextMenuAction):
        * platform/gtk/KeyEventGtk.cpp:
        (WebCore::PlatformKeyboardEvent::PlatformKeyboardEvent):
        * platform/gtk/LocalizedStringsGtk.cpp:
        (WebCore::contextMenuItemTagSelectAll):
        * platform/gtk/MouseEventGtk.cpp:
        (WebCore::PlatformMouseEvent::PlatformMouseEvent):
        * platform/gtk/PasteboardGtk.cpp:
        (WebCore::Pasteboard::writeSelection):
        (WebCore::Pasteboard::documentFragment):
        * platform/gtk/WheelEventGtk.cpp:
        (WebCore::PlatformWheelEvent::PlatformWheelEvent):

WebKit/gtk

2009-04-03  Gustavo Noronha Silva  &lt;gustavo.noronha@collabora.co.uk&gt;

        Reviewed by Holger Freyther.

        Remove pre-processor checks for GTK+ &gt;= 2.10, since we now require
        at least that version.

        * WebCoreSupport/EditorClientGtk.cpp:
        (WebKit::clipboard_clear_contents_cb):
        (WebKit::EditorClient::respondToChangedSelection):
        * webkit/webkitwebframe.cpp:
        * webkit/webkitwebview.cpp:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreplatformgraphicsgtkFontPlatformDataGtkcpp">trunk/WebCore/platform/graphics/gtk/FontPlatformDataGtk.cpp</a></li>
<li><a href="#trunkWebCoreplatformgtkContextMenuItemGtkcpp">trunk/WebCore/platform/gtk/ContextMenuItemGtk.cpp</a></li>
<li><a href="#trunkWebCoreplatformgtkKeyEventGtkcpp">trunk/WebCore/platform/gtk/KeyEventGtk.cpp</a></li>
<li><a href="#trunkWebCoreplatformgtkLocalizedStringsGtkcpp">trunk/WebCore/platform/gtk/LocalizedStringsGtk.cpp</a></li>
<li><a href="#trunkWebCoreplatformgtkMouseEventGtkcpp">trunk/WebCore/platform/gtk/MouseEventGtk.cpp</a></li>
<li><a href="#trunkWebCoreplatformgtkPasteboardGtkcpp">trunk/WebCore/platform/gtk/PasteboardGtk.cpp</a></li>
<li><a href="#trunkWebCoreplatformgtkWheelEventGtkcpp">trunk/WebCore/platform/gtk/WheelEventGtk.cpp</a></li>
<li><a href="#trunkWebKitgtkChangeLog">trunk/WebKit/gtk/ChangeLog</a></li>
<li><a href="#trunkWebKitgtkWebCoreSupportEditorClientGtkcpp">trunk/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp</a></li>
<li><a href="#trunkWebKitgtkwebkitwebkitwebframecpp">trunk/WebKit/gtk/webkit/webkitwebframe.cpp</a></li>
<li><a href="#trunkWebKitgtkwebkitwebkitwebviewcpp">trunk/WebKit/gtk/webkit/webkitwebview.cpp</a></li>
<li><a href="#trunkconfigureac">trunk/configure.ac</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (42198 => 42199)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog        2009-04-03 06:49:19 UTC (rev 42198)
+++ trunk/ChangeLog        2009-04-03 13:00:35 UTC (rev 42199)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2009-04-03  Gustavo Noronha Silva  &lt;gustavo.noronha@collabora.co.uk&gt;
+
+        Reviewed by Holger Freyther.
+
+        Require GTK+ &gt;= 2.10; 2.8 is already very old, and some very
+        useful APIs are only available since 2.10.
+
+        * configure.ac:
+
</ins><span class="cx"> 2009-04-01  Christian Dywan  &lt;christian@twotoasts.de&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Holger Freyther.
</span></span></pre></div>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (42198 => 42199)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2009-04-03 06:49:19 UTC (rev 42198)
+++ trunk/WebCore/ChangeLog        2009-04-03 13:00:35 UTC (rev 42199)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2009-04-03  Gustavo Noronha Silva  &lt;gustavo.noronha@collabora.co.uk&gt;
+
+        Reviewed by Holger Freyther.
+
+        Remove pre-processor checks for GTK+ &gt;= 2.10, since we now require
+        at least that version.
+
+        * platform/graphics/gtk/FontPlatformDataGtk.cpp:
+        (WebCore::FontPlatformData::FontPlatformData):
+        * platform/gtk/ContextMenuItemGtk.cpp:
+        (WebCore::gtkStockIDFromContextMenuAction):
+        * platform/gtk/KeyEventGtk.cpp:
+        (WebCore::PlatformKeyboardEvent::PlatformKeyboardEvent):
+        * platform/gtk/LocalizedStringsGtk.cpp:
+        (WebCore::contextMenuItemTagSelectAll):
+        * platform/gtk/MouseEventGtk.cpp:
+        (WebCore::PlatformMouseEvent::PlatformMouseEvent):
+        * platform/gtk/PasteboardGtk.cpp:
+        (WebCore::Pasteboard::writeSelection):
+        (WebCore::Pasteboard::documentFragment):
+        * platform/gtk/WheelEventGtk.cpp:
+        (WebCore::PlatformWheelEvent::PlatformWheelEvent):
+
</ins><span class="cx"> 2009-04-02  Simon Fraser  &lt;simon.fraser@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Dan Bernstein
</span></span></pre></div>
<a id="trunkWebCoreplatformgraphicsgtkFontPlatformDataGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/graphics/gtk/FontPlatformDataGtk.cpp (42198 => 42199)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/graphics/gtk/FontPlatformDataGtk.cpp        2009-04-03 06:49:19 UTC (rev 42198)
+++ trunk/WebCore/platform/graphics/gtk/FontPlatformDataGtk.cpp        2009-04-03 13:00:35 UTC (rev 42199)
</span><span class="lines">@@ -109,10 +109,9 @@
</span><span class="cx">     cairo_matrix_init_scale(&amp;fontMatrix, fontDescription.computedPixelSize(), fontDescription.computedPixelSize());
</span><span class="cx">     cairo_matrix_init_identity(&amp;ctm);
</span><span class="cx"> 
</span><del>-#if GTK_CHECK_VERSION(2,10,0)
</del><span class="cx">     if (GdkScreen* screen = gdk_screen_get_default())
</span><span class="cx">         options = gdk_screen_get_font_options(screen);
</span><del>-#endif
</del><ins>+
</ins><span class="cx">     // gdk_screen_get_font_options() returns NULL if no default options are
</span><span class="cx">     // set, so we always have to check.
</span><span class="cx">     if (!options)
</span><span class="lines">@@ -150,10 +149,9 @@
</span><span class="cx">     static const cairo_font_options_t* defaultOptions = cairo_font_options_create();
</span><span class="cx">     const cairo_font_options_t* options = NULL;
</span><span class="cx"> 
</span><del>-#if GTK_CHECK_VERSION(2,10,0)
</del><span class="cx">     if (GdkScreen* screen = gdk_screen_get_default())
</span><span class="cx">         options = gdk_screen_get_font_options(screen);
</span><del>-#endif
</del><ins>+
</ins><span class="cx">     // gdk_screen_get_font_options() returns NULL if no default options are
</span><span class="cx">     // set, so we always have to check.
</span><span class="cx">     if (!options)
</span></span></pre></div>
<a id="trunkWebCoreplatformgtkContextMenuItemGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/gtk/ContextMenuItemGtk.cpp (42198 => 42199)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/gtk/ContextMenuItemGtk.cpp        2009-04-03 06:49:19 UTC (rev 42198)
+++ trunk/WebCore/platform/gtk/ContextMenuItemGtk.cpp        2009-04-03 13:00:35 UTC (rev 42199)
</span><span class="lines">@@ -56,10 +56,8 @@
</span><span class="cx">         return GTK_STOCK_PASTE;
</span><span class="cx">     case ContextMenuItemTagDelete:
</span><span class="cx">         return GTK_STOCK_DELETE;
</span><del>-#if GTK_CHECK_VERSION(2, 10, 0)
</del><span class="cx">     case ContextMenuItemTagSelectAll:
</span><span class="cx">         return GTK_STOCK_SELECT_ALL;
</span><del>-#endif
</del><span class="cx">     case ContextMenuItemTagSpellingGuess:
</span><span class="cx">         return GTK_STOCK_INFO;
</span><span class="cx">     case ContextMenuItemTagIgnoreSpelling:
</span></span></pre></div>
<a id="trunkWebCoreplatformgtkKeyEventGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/gtk/KeyEventGtk.cpp (42198 => 42199)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/gtk/KeyEventGtk.cpp        2009-04-03 06:49:19 UTC (rev 42198)
+++ trunk/WebCore/platform/gtk/KeyEventGtk.cpp        2009-04-03 13:00:35 UTC (rev 42199)
</span><span class="lines">@@ -37,9 +37,6 @@
</span><span class="cx"> #include &lt;gdk/gdk.h&gt;
</span><span class="cx"> #include &lt;gdk/gdkkeysyms.h&gt;
</span><span class="cx"> 
</span><del>-// GTK_CHECK_VERSION is defined in gtk/gtkversion.h
-#include &lt;gtk/gtk.h&gt;
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><span class="cx"> // FIXME: This is incomplete.  We should change this to mirror
</span><span class="lines">@@ -536,12 +533,7 @@
</span><span class="cx">     , m_shiftKey((event-&gt;state &amp; GDK_SHIFT_MASK) || (event-&gt;keyval == GDK_3270_BackTab))
</span><span class="cx">     , m_ctrlKey(event-&gt;state &amp; GDK_CONTROL_MASK)
</span><span class="cx">     , m_altKey(event-&gt;state &amp; GDK_MOD1_MASK)
</span><del>-#if GTK_CHECK_VERSION(2,10,0)
</del><span class="cx">     , m_metaKey(event-&gt;state &amp; GDK_META_MASK)
</span><del>-#else
-    // GDK_MOD2_MASK doesn't always mean meta so we can't use it
-    , m_metaKey(false)
-#endif
</del><span class="cx">     , m_gdkEventKey(event)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkWebCoreplatformgtkLocalizedStringsGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/gtk/LocalizedStringsGtk.cpp (42198 => 42199)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/gtk/LocalizedStringsGtk.cpp        2009-04-03 06:49:19 UTC (rev 42198)
+++ trunk/WebCore/platform/gtk/LocalizedStringsGtk.cpp        2009-04-03 13:00:35 UTC (rev 42199)
</span><span class="lines">@@ -125,11 +125,7 @@
</span><span class="cx"> 
</span><span class="cx"> String contextMenuItemTagSelectAll()
</span><span class="cx"> {
</span><del>-#if GTK_CHECK_VERSION(2,10,0)
</del><span class="cx">     static String stockLabel = String::fromUTF8(gtkStockLabel(GTK_STOCK_SELECT_ALL));
</span><del>-#else
-    static String stockLabel = String::fromUTF8(_(&quot;Select _All&quot;));
-#endif
</del><span class="cx">     return stockLabel;
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebCoreplatformgtkMouseEventGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/gtk/MouseEventGtk.cpp (42198 => 42199)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/gtk/MouseEventGtk.cpp        2009-04-03 06:49:19 UTC (rev 42198)
+++ trunk/WebCore/platform/gtk/MouseEventGtk.cpp        2009-04-03 13:00:35 UTC (rev 42199)
</span><span class="lines">@@ -31,9 +31,6 @@
</span><span class="cx"> 
</span><span class="cx"> #include &lt;gdk/gdk.h&gt;
</span><span class="cx"> 
</span><del>-// GTK_CHECK_VERSION is defined in gtk/gtkversion.h
-#include &lt;gtk/gtk.h&gt;
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><span class="cx"> // FIXME: Would be even better to figure out which modifier is Alt instead of always using GDK_MOD1_MASK.
</span><span class="lines">@@ -47,12 +44,7 @@
</span><span class="cx">     m_shiftKey = event-&gt;state &amp; GDK_SHIFT_MASK;
</span><span class="cx">     m_ctrlKey = event-&gt;state &amp; GDK_CONTROL_MASK;
</span><span class="cx">     m_altKey = event-&gt;state &amp; GDK_MOD1_MASK;
</span><del>-#if GTK_CHECK_VERSION(2,10,0)
</del><span class="cx">     m_metaKey = event-&gt;state &amp; GDK_META_MASK;
</span><del>-#else
-    // GDK_MOD2_MASK doesn't always mean meta so we can't use it
-    m_metaKey = false;
-#endif
</del><span class="cx"> 
</span><span class="cx">     switch (event-&gt;type) {
</span><span class="cx">     case GDK_BUTTON_PRESS:
</span></span></pre></div>
<a id="trunkWebCoreplatformgtkPasteboardGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/gtk/PasteboardGtk.cpp (42198 => 42199)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/gtk/PasteboardGtk.cpp        2009-04-03 06:49:19 UTC (rev 42198)
+++ trunk/WebCore/platform/gtk/PasteboardGtk.cpp        2009-04-03 13:00:35 UTC (rev 42199)
</span><span class="lines">@@ -103,7 +103,6 @@
</span><span class="cx"> void Pasteboard::writeSelection(Range* selectedRange, bool canSmartCopyOrDelete, Frame* frame)
</span><span class="cx"> {
</span><span class="cx">     GtkClipboard* clipboard = m_helper-&gt;getClipboard(frame);
</span><del>-#if GTK_CHECK_VERSION(2,10,0)
</del><span class="cx">     gchar* text = g_strdup(frame-&gt;selectedText().utf8().data());
</span><span class="cx">     gchar* markup = g_strdup(createMarkup(selectedRange, 0, AnnotateForInterchange).utf8().data());
</span><span class="cx">     PasteboardSelectionData* data = new PasteboardSelectionData(text, markup);
</span><span class="lines">@@ -113,9 +112,6 @@
</span><span class="cx">     gtk_clipboard_set_with_data(clipboard, targets, n_targets,
</span><span class="cx">                                 clipboard_get_contents_cb, clipboard_clear_contents_cb, data);
</span><span class="cx">     gtk_target_table_free(targets, n_targets);
</span><del>-#else
-    gtk_clipboard_set_text(clipboard, frame-&gt;selectedText().utf8().data(), frame-&gt;selectedText().utf8().length());
-#endif
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void Pasteboard::writeURL(const KURL&amp; url, const String&amp;, Frame* frame)
</span><span class="lines">@@ -163,11 +159,7 @@
</span><span class="cx"> PassRefPtr&lt;DocumentFragment&gt; Pasteboard::documentFragment(Frame* frame, PassRefPtr&lt;Range&gt; context,
</span><span class="cx">                                                           bool allowPlainText, bool&amp; chosePlainText)
</span><span class="cx"> {
</span><del>-#if GTK_CHECK_VERSION(2,10,0)
</del><span class="cx">     GdkAtom textHtml = gdk_atom_intern_static_string(&quot;text/html&quot;);
</span><del>-#else
-    GdkAtom textHtml = gdk_atom_intern(&quot;text/html&quot;, false);
-#endif
</del><span class="cx">     GtkClipboard* clipboard = m_helper-&gt;getClipboard(frame);
</span><span class="cx">     chosePlainText = false;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebCoreplatformgtkWheelEventGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/gtk/WheelEventGtk.cpp (42198 => 42199)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/gtk/WheelEventGtk.cpp        2009-04-03 06:49:19 UTC (rev 42198)
+++ trunk/WebCore/platform/gtk/WheelEventGtk.cpp        2009-04-03 13:00:35 UTC (rev 42199)
</span><span class="lines">@@ -31,9 +31,6 @@
</span><span class="cx"> 
</span><span class="cx"> #include &lt;gdk/gdk.h&gt;
</span><span class="cx"> 
</span><del>-// GTK_CHECK_VERSION is defined in gtk/gtkversion.h
-#include &lt;gtk/gtk.h&gt;
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><span class="cx"> // Keep this in sync with the other platform event constructors
</span><span class="lines">@@ -69,12 +66,7 @@
</span><span class="cx">     m_shiftKey = event-&gt;state &amp; GDK_SHIFT_MASK;
</span><span class="cx">     m_ctrlKey = event-&gt;state &amp; GDK_CONTROL_MASK;
</span><span class="cx">     m_altKey = event-&gt;state &amp; GDK_MOD1_MASK;
</span><del>-#if GTK_CHECK_VERSION(2,10,0)
</del><span class="cx">     m_metaKey = event-&gt;state &amp; GDK_META_MASK;
</span><del>-#else
-    // GDK_MOD2_MASK doesn't always mean meta so we can't use it
-    m_metaKey = false;
-#endif
</del><span class="cx"> 
</span><span class="cx">     // FIXME: retrieve the user setting for the number of lines to scroll on each wheel event
</span><span class="cx">     m_deltaX *= static_cast&lt;float&gt;(cScrollbarPixelsPerLineStep);
</span></span></pre></div>
<a id="trunkWebKitgtkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/gtk/ChangeLog (42198 => 42199)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/gtk/ChangeLog        2009-04-03 06:49:19 UTC (rev 42198)
+++ trunk/WebKit/gtk/ChangeLog        2009-04-03 13:00:35 UTC (rev 42199)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2009-04-03  Gustavo Noronha Silva  &lt;gustavo.noronha@collabora.co.uk&gt;
+
+        Reviewed by Holger Freyther.
+
+        Remove pre-processor checks for GTK+ &gt;= 2.10, since we now require
+        at least that version.
+
+        * WebCoreSupport/EditorClientGtk.cpp:
+        (WebKit::clipboard_clear_contents_cb):
+        (WebKit::EditorClient::respondToChangedSelection):
+        * webkit/webkitwebframe.cpp:
+        * webkit/webkitwebview.cpp:
+
</ins><span class="cx"> 2009-04-02  Gustavo Noronha Silva  &lt;gustavo.noronha@collabora.co.uk&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Alexey  Proskuryakov.
</span></span></pre></div>
<a id="trunkWebKitgtkWebCoreSupportEditorClientGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp (42198 => 42199)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp        2009-04-03 06:49:19 UTC (rev 42198)
+++ trunk/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp        2009-04-03 13:00:35 UTC (rev 42199)
</span><span class="lines">@@ -164,7 +164,6 @@
</span><span class="cx">     notImplemented();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#if GTK_CHECK_VERSION(2,10,0)
</del><span class="cx"> static void clipboard_get_contents_cb(GtkClipboard* clipboard, GtkSelectionData* selection_data, guint info, gpointer data)
</span><span class="cx"> {
</span><span class="cx">     WebKitWebView* webView = reinterpret_cast&lt;WebKitWebView*&gt;(data);
</span><span class="lines">@@ -189,7 +188,6 @@
</span><span class="cx">     // Collapse the selection without clearing it
</span><span class="cx">     frame-&gt;selection()-&gt;setBase(frame-&gt;selection()-&gt;extent(), frame-&gt;selection()-&gt;affinity());
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx"> void EditorClient::respondToChangedSelection()
</span><span class="cx"> {
</span><span class="lines">@@ -202,7 +200,6 @@
</span><span class="cx">     if (targetFrame-&gt;editor()-&gt;ignoreCompositionSelectionChange())
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-#if GTK_CHECK_VERSION(2,10,0)
</del><span class="cx">     GtkClipboard* clipboard = gtk_widget_get_clipboard(GTK_WIDGET(m_webView), GDK_SELECTION_PRIMARY);
</span><span class="cx">     if (targetFrame-&gt;selection()-&gt;isRange()) {
</span><span class="cx">         GtkTargetList* targetList = webkit_web_view_get_copy_target_list(m_webView);
</span><span class="lines">@@ -213,7 +210,6 @@
</span><span class="cx">         gtk_target_table_free(targets, targetCount);
</span><span class="cx">     } else if (gtk_clipboard_get_owner(clipboard) == G_OBJECT(m_webView))
</span><span class="cx">         gtk_clipboard_clear(clipboard);
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx">     if (!targetFrame-&gt;editor()-&gt;hasComposition())
</span><span class="cx">         return;
</span></span></pre></div>
<a id="trunkWebKitgtkwebkitwebkitwebframecpp"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/gtk/webkit/webkitwebframe.cpp (42198 => 42199)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/gtk/webkit/webkitwebframe.cpp        2009-04-03 06:49:19 UTC (rev 42198)
+++ trunk/WebKit/gtk/webkit/webkitwebframe.cpp        2009-04-03 13:00:35 UTC (rev 42199)
</span><span class="lines">@@ -610,8 +610,6 @@
</span><span class="cx">     return g_strdup(string.utf8().data());
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#if GTK_CHECK_VERSION(2,10,0)
-
</del><span class="cx"> static void begin_print(GtkPrintOperation* op, GtkPrintContext* context, gpointer user_data)
</span><span class="cx"> {
</span><span class="cx">     PrintContext* printContext = reinterpret_cast&lt;PrintContext*&gt;(user_data);
</span><span class="lines">@@ -679,15 +677,6 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#else
-
-void webkit_web_frame_print(WebKitWebFrame*)
-{
-    g_warning(&quot;Printing support is not available in older versions of GTK+&quot;);
-}
-
-#endif
-
</del><span class="cx"> bool webkit_web_frame_pause_animation(WebKitWebFrame* frame, const gchar* name, double time, const gchar* element)
</span><span class="cx"> {
</span><span class="cx">     ASSERT(core(frame));
</span></span></pre></div>
<a id="trunkWebKitgtkwebkitwebkitwebviewcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/gtk/webkit/webkitwebview.cpp (42198 => 42199)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/gtk/webkit/webkitwebview.cpp        2009-04-03 06:49:19 UTC (rev 42198)
+++ trunk/WebKit/gtk/webkit/webkitwebview.cpp        2009-04-03 13:00:35 UTC (rev 42199)
</span><span class="lines">@@ -291,14 +291,12 @@
</span><span class="cx">     case PROP_URI:
</span><span class="cx">         g_value_set_string(value, webkit_web_view_get_uri(webView));
</span><span class="cx">         break;
</span><del>-#if GTK_CHECK_VERSION(2,10,0)
</del><span class="cx">     case PROP_COPY_TARGET_LIST:
</span><span class="cx">         g_value_set_boxed(value, webkit_web_view_get_copy_target_list(webView));
</span><span class="cx">         break;
</span><span class="cx">     case PROP_PASTE_TARGET_LIST:
</span><span class="cx">         g_value_set_boxed(value, webkit_web_view_get_paste_target_list(webView));
</span><span class="cx">         break;
</span><del>-#endif
</del><span class="cx">     case PROP_EDITABLE:
</span><span class="cx">         g_value_set_boolean(value, webkit_web_view_get_editable(webView));
</span><span class="cx">         break;
</span><span class="lines">@@ -1683,7 +1681,6 @@
</span><span class="cx">                                                         NULL,
</span><span class="cx">                                                         WEBKIT_PARAM_READABLE));
</span><span class="cx"> 
</span><del>-#if GTK_CHECK_VERSION(2,10,0)
</del><span class="cx">     /**
</span><span class="cx">     * WebKitWebView:copy-target-list:
</span><span class="cx">     *
</span><span class="lines">@@ -1711,7 +1708,6 @@
</span><span class="cx">                                                        &quot;The list of targets this web view supports for clipboard pasting&quot;,
</span><span class="cx">                                                        GTK_TYPE_TARGET_LIST,
</span><span class="cx">                                                        WEBKIT_PARAM_READABLE));
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx">     g_object_class_install_property(objectClass, PROP_SETTINGS,
</span><span class="cx">                                     g_param_spec_object(&quot;settings&quot;,
</span><span class="lines">@@ -1833,7 +1829,6 @@
</span><span class="cx">         return 96.0;
</span><span class="cx"> 
</span><span class="cx">     gdouble DPI = defaultDPI;
</span><del>-#if GTK_CHECK_VERSION(2,10,0)
</del><span class="cx">     GdkScreen* screen = gtk_widget_has_screen(GTK_WIDGET(webView)) ? gtk_widget_get_screen(GTK_WIDGET(webView)) : gdk_screen_get_default();
</span><span class="cx">     if (screen) {
</span><span class="cx">         DPI = gdk_screen_get_resolution(screen);
</span><span class="lines">@@ -1841,7 +1836,6 @@
</span><span class="cx">         if (DPI == -1)
</span><span class="cx">             DPI = defaultDPI;
</span><span class="cx">     }
</span><del>-#endif
</del><span class="cx">     ASSERT(DPI &gt; 0);
</span><span class="cx">     return DPI;
</span><span class="cx"> }
</span><span class="lines">@@ -2019,11 +2013,7 @@
</span><span class="cx"> 
</span><span class="cx">     priv-&gt;zoomFullContent = FALSE;
</span><span class="cx"> 
</span><del>-#if GTK_CHECK_VERSION(2,10,0)
</del><span class="cx">     GdkAtom textHtml = gdk_atom_intern_static_string(&quot;text/html&quot;);
</span><del>-#else
-    GdkAtom textHtml = gdk_atom_intern(&quot;text/html&quot;, false);
-#endif
</del><span class="cx">     /* Targets for copy */
</span><span class="cx">     priv-&gt;copy_target_list = gtk_target_list_new(NULL, 0);
</span><span class="cx">     gtk_target_list_add(priv-&gt;copy_target_list, textHtml, 0, WEBKIT_WEB_VIEW_TARGET_INFO_HTML);
</span></span></pre></div>
<a id="trunkconfigureac"></a>
<div class="modfile"><h4>Modified: trunk/configure.ac (42198 => 42199)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/configure.ac        2009-04-03 06:49:19 UTC (rev 42198)
+++ trunk/configure.ac        2009-04-03 13:00:35 UTC (rev 42199)
</span><span class="lines">@@ -183,7 +183,7 @@
</span><span class="cx"> 
</span><span class="cx"> # minimum GTK+ base dependencies
</span><span class="cx"> PANGO_REQUIRED_VERSION=1.0
</span><del>-GTK_REQUIRED_VERSION=2.8
</del><ins>+GTK_REQUIRED_VERSION=2.10
</ins><span class="cx"> 
</span><span class="cx"> # optional modules
</span><span class="cx"> LIBSOUP_REQUIRED_VERSION=2.25.91
</span></span></pre>
</div>
</div>

</body>
</html>