gdk3 3.0.9-x86-mingw32 → 3.1.0-x86-mingw32

data/vendor/local/share/gtk-doc/html/gtk3/chap-css-properties.html

@@ -34,11 +34,12 @@ GTK+ CSS Properties
 <a name="css-properties"></a><h2>Supported CSS Properties</h2>
 <p>
       GTK+ supports CSS properties and shorthands as far as they can be applied
-      in the context of widgets, and only adds its own properties only when needed.
+      in the context of widgets, and adds its own properties only when needed.
       All GTK+-specific properties have a -gtk prefix.
     </p>
 <p>
-      All properties support the following keywords: inherit, initial, unset.
+      All properties support the following keywords: inherit, initial, unset, with
+      the same meaning as in <a class="ulink" href="https://www.w3.org/TR/css3-cascade/#defaulting-keywords" target="_top">CSS</a>.
     </p>
 <p>
       The following basic datatypes are used throughout:
@@ -93,19 +94,19 @@ GTK+ CSS Properties
 </colgroup>
 <tbody>
 <tr>
-<td><p><span class="term">4 values:</span></p></td>
+<td><p><span class="term">4 values: </span></p></td>
 <td>top right bottom left</td>
 </tr>
 <tr>
-<td><p><span class="term">3 values:</span></p></td>
+<td><p><span class="term">3 values: </span></p></td>
 <td>top horizontal left</td>
 </tr>
 <tr>
-<td><p><span class="term">2 values:</span></p></td>
+<td><p><span class="term">2 values: </span></p></td>
 <td>vertical horizontal</td>
 </tr>
 <tr>
-<td><p><span class="term">1 value:</span></p></td>
+<td><p><span class="term">1 value: </span></p></td>
 <td>all</td>
 </tr>
 </tbody>
@@ -1260,8 +1261,11 @@ GTK+ CSS Properties
 </table>
 </div>
 </div>
-<br class="table-break"><div class="table">
-<a name="id-1.5.3.3.33"></a><p class="title"><b>Table 10. Background properties</b></p>
+<br class="table-break"><p>
+        GTK+ uses the CSS outline properties to render the 'focus rectangle'.
+      </p>
+<div class="table">
+<a name="id-1.5.3.3.34"></a><p class="title"><b>Table 10. Background properties</b></p>
 <div class="table-contents">
 <table class="table" summary="Background properties" width="100%" border="1">
 <colgroup>
@@ -1359,6 +1363,15 @@ GTK+ CSS Properties
 <td>not supported: urls without quotes, CSS radial gradients, colors in crossfades</td>
 </tr>
 <tr>
+<td>background-blend-mode</td>
+<td><code class="code">〈blend-mode〉 [ , 〈blend-mode〉 ]*</code></td>
+<td><code class="code">normal</code></td>
+<td align="center"> </td>
+<td align="center"> </td>
+<td> </td>
+<td>only affects multiple backgrounds</td>
+</tr>
+<tr>
 <td>box‑shadow</td>
 <td><code class="code">none | 〈box shadow〉 [ , 〈box shadow〉 ]*</code></td>
 <td><code class="code">none</code></td>
@@ -1404,10 +1417,18 @@ GTK+ CSS Properties
 <code class="code">〈bg-image〉 = 〈image〉 | none</code><br>
 <code class="code">〈bg-layer〉 = 〈bg-image〉 || 〈position〉 [ / 〈bg-size〉 ]? || 〈bg-repeat〉 || 〈box〉 || 〈box〉</code><br>
 <code class="code">〈final-bg-layer〉 = 〈bg-image〉 || 〈position〉 [ / 〈bg-size〉 ]? || 〈bg-repeat〉 || 〈box〉 || 〈box〉|| 〈color〉</code><br>
+<code class="code">〈blend-mode〉 = color || color-burn || color-dodge || darken || difference || exclusion || hard-light || hue || lighten || luminosity || multiply || normal || overlay || saturate || screen || soft-light</code><br>
 <code class="code">〈box shadow〉 = inset? &amp;&amp; 〈length〉{2,4}? &amp;&amp; 〈color〉?</code><br>
 </p></div>
+<p>
+        As in CSS, the background color is rendered underneath all the background image layers, so it will only be visible if
+        background images are absent or have transparency.
+      </p>
+<p>
+        Alternatively, multiple backgrounds can be blended using the <code class="code">background-blend-mode</code> property.
+      </p>
 <div class="table">
-<a name="id-1.5.3.3.35"></a><p class="title"><b>Table 11. Transition properties</b></p>
+<a name="id-1.5.3.3.38"></a><p class="title"><b>Table 11. Transition properties</b></p>
 <div class="table-contents">
 <table class="table" summary="Transition properties" width="100%" border="1">
 <colgroup>
@@ -1498,7 +1519,7 @@ GTK+ CSS Properties
 <code class="code">〈single-transition〉 = [ none | 〈property name〉 ] || 〈time〉 || 〈single-transition-timing-function〉 || 〈time〉</code><br>
 </p></div>
 <div class="table">
-<a name="id-1.5.3.3.37"></a><p class="title"><b>Table 12. Animation properties</b></p>
+<a name="id-1.5.3.3.40"></a><p class="title"><b>Table 12. Animation properties</b></p>
 <div class="table-contents">
 <table class="table" summary="Animation properties" width="100%" border="1">
 <colgroup>
@@ -1628,7 +1649,7 @@ GTK+ CSS Properties
 <code class="code">                       〈single-animation-iteration-count〉 || 〈single-animation-direction〉 || 〈single-animation-play-state〉 || 〈single-animation-fill-mode〉</code><br>
 </p></div>
 <div class="table">
-<a name="id-1.5.3.3.39"></a><p class="title"><b>Table 13. Key binding properties</b></p>
+<a name="id-1.5.3.3.42"></a><p class="title"><b>Table 13. Key binding properties</b></p>
 <div class="table-contents"><table class="table" summary="Key binding properties" width="100%" border="1">
 <colgroup>
 <col>

data/vendor/local/share/gtk-doc/html/gtk3/chap-drawing-model.html

@@ -92,7 +92,7 @@
 <p>
         The windowing system generates events for native windows. The GDK
         interface to the windowing system translates such native events into
-        <a href="http://developer.gnome.org/gdk3/gdk3-Event-Structures.html#GdkEvent"><span class="structname">GdkEvent</span></a>
+        <a href="http://developer.gnome.org/gdk3/gdk4-Event-Structures.html#GdkEvent"><span class="structname">GdkEvent</span></a>
         structures and sends them on to the GTK layer.  In turn, the GTK layer
         finds the widget that corresponds to a particular
         <code class="classname">GdkWindow</code> and emits the corresponding event
@@ -318,15 +318,15 @@
 7
 8
 9</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="keyword">static</span><span class="normal"> </span><span class="type">void</span>
-<span class="function">my_widget_init</span><span class="normal"> </span><span class="symbol">(</span><span class="usertype">MyWidget</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">widget</span><span class="symbol">)</span>
-<span class="cbracket">{</span>
-<span class="normal">  </span><span class="symbol">...</span>
+        <td class="listing_code"><pre class="programlisting"><span class="gtkdoc kwb">static void</span>
+<span class="function">my_widget_init</span> <span class="gtkdoc opt">(</span>MyWidget <span class="gtkdoc opt">*</span>widget<span class="gtkdoc opt">)</span>
+<span class="gtkdoc opt">{</span>
+  <span class="gtkdoc opt">...</span>
 
-<span class="normal">  </span><span class="function"><a href="GtkWidget.html#gtk-widget-set-double-buffered">gtk_widget_set_double_buffered</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">widget</span><span class="symbol">,</span><span class="normal"> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS">FALSE</a></span><span class="symbol">);</span>
+  <span class="function"><a href="GtkWidget.html#gtk-widget-set-double-buffered">gtk_widget_set_double_buffered</a></span> <span class="gtkdoc opt">(</span>widget<span class="gtkdoc opt">,</span> FALSE<span class="gtkdoc opt">);</span>
 
-<span class="normal">  </span><span class="symbol">...</span>
-<span class="cbracket">}</span></pre></td>
+  <span class="gtkdoc opt">...</span>
+<span class="gtkdoc opt">}</span></pre></td>
       </tr>
     </tbody>
   </table>

data/vendor/local/share/gtk-doc/html/gtk3/chap-input-handling.html

@@ -44,7 +44,7 @@
      The most basic input devices that every computer user has interacted with are
      keyboards and mice; beyond these, GTK+ supports touchpads, touchscreens and
      more exotic input devices such as graphics tablets. Inside GTK+, every such
-     input device is represented by a <a href="http://library.gnome.org/devel/gdk2/gdk2-Input-Devices.html#GdkDevice"><span class="type">GdkDevice</span></a> object.
+     input device is represented by a <a href="http://developer.gnome.org/gdk3/GdkDevice.html#GdkDevice-struct"><span class="type">GdkDevice</span></a> object.
     </p>
 <p>
      To simplify dealing with the variability between these input devices, GTK+
@@ -67,16 +67,16 @@
      the window with the keyboard focus.
     </p>
 <p>
-     GDK translates these raw windowing system events into <a href="http://developer.gnome.org/gdk3/gdk3-Event-Structures.html#GdkEvent"><span class="type">GdkEvents</span></a>.
+     GDK translates these raw windowing system events into <a href="http://developer.gnome.org/gdk3/gdk4-Event-Structures.html#GdkEvent"><span class="type">GdkEvents</span></a>.
      Typical input events are:
      </p>
 <table border="0" summary="Simple list" class="simplelist">
-<tr><td><a href="http://developer.gnome.org/gdk3/gdk3-Event-Structures.html#GdkEventButton"><span class="type">GdkEventButton</span></a></td></tr>
-<tr><td><a href="http://developer.gnome.org/gdk3/gdk3-Event-Structures.html#GdkEventMotion"><span class="type">GdkEventMotion</span></a></td></tr>
-<tr><td><a href="http://developer.gnome.org/gdk3/gdk3-Event-Structures.html#GdkEventCrossing"><span class="type">GdkEventCrossing</span></a></td></tr>
-<tr><td><a href="http://developer.gnome.org/gdk3/gdk3-Event-Structures.html#GdkEventKey"><span class="type">GdkEventKey</span></a></td></tr>
-<tr><td><a href="http://developer.gnome.org/gdk3/gdk3-Event-Structures.html#GdkEventFocus"><span class="type">GdkEventFocus</span></a></td></tr>
-<tr><td><a href="http://developer.gnome.org/gdk3/gdk3-Event-Structures.html#GdkEventTouch"><span class="type">GdkEventTouch</span></a></td></tr>
+<tr><td><a href="http://developer.gnome.org/gdk3/gdk4-Event-Structures.html#GdkEventButton"><span class="type">GdkEventButton</span></a></td></tr>
+<tr><td><a href="http://developer.gnome.org/gdk3/gdk4-Event-Structures.html#GdkEventMotion"><span class="type">GdkEventMotion</span></a></td></tr>
+<tr><td><a href="http://developer.gnome.org/gdk3/gdk4-Event-Structures.html#GdkEventCrossing"><span class="type">GdkEventCrossing</span></a></td></tr>
+<tr><td><a href="http://developer.gnome.org/gdk3/gdk4-Event-Structures.html#GdkEventKey"><span class="type">GdkEventKey</span></a></td></tr>
+<tr><td><a href="http://developer.gnome.org/gdk3/gdk4-Event-Structures.html#GdkEventFocus"><span class="type">GdkEventFocus</span></a></td></tr>
+<tr><td><a href="http://developer.gnome.org/gdk3/gdk4-Event-Structures.html#GdkEventTouch"><span class="type">GdkEventTouch</span></a></td></tr>
 </table>
 <p>
     </p>
@@ -85,14 +85,14 @@
       grabs (system-wide or in-app) are taking input away:
       </p>
 <table border="0" summary="Simple list" class="simplelist">
-<tr><td><a href="http://developer.gnome.org/gdk3/gdk3-Event-Structures.html#GdkEventGrabBroken"><span class="type">GdkEventGrabBroken</span></a></td></tr>
+<tr><td><a href="http://developer.gnome.org/gdk3/gdk4-Event-Structures.html#GdkEventGrabBroken"><span class="type">GdkEventGrabBroken</span></a></td></tr>
 <tr><td><a class="link" href="GtkWidget.html#GtkWidget-grab-notify" title="The “grab-notify” signal"><span class="type">“grab-notify”</span></a></td></tr>
 </table>
 <p>
     </p>
 <p>
       When GTK+ is initialized, it sets up an event handler function with
-      <a href="http://developer.gnome.org/gdk3/gdk3-Events.html#gdk-event-handler-set"><code class="function">gdk_event_handler_set()</code></a>, which receives all of these input events
+      <a href="http://developer.gnome.org/gdk3/gdk4-Events.html#gdk-event-handler-set"><code class="function">gdk_event_handler_set()</code></a>, which receives all of these input events
       (as well as others, for instance window management related events).
     </p>
 </div>
@@ -100,7 +100,7 @@
 <div class="refsect2">
 <a name="event-propagation"></a><h3>Event propagation</h3>
 <p>
-      For widgets which have a <a href="http://library.gnome.org/devel/gdk2/gdk2-Windows.html#GdkWindow"><span class="type">GdkWindow</span></a> set, events are received from the
+      For widgets which have a <a href="http://developer.gnome.org/gdk3/gdk4-Windows.html#GdkWindow-struct"><span class="type">GdkWindow</span></a> set, events are received from the
       windowing system and passed to <a class="link" href="gtk3-General.html#gtk-main-do-event" title="gtk_main_do_event ()"><code class="function">gtk_main_do_event()</code></a>. See its documentation
       for details of what it does: compression of enter/leave events,
       identification of the widget receiving the event, pushing the event onto a
@@ -108,26 +108,26 @@
       widget.
     </p>
 <p>
-      When a GDK backend produces an input event, it is tied to a <a href="http://library.gnome.org/devel/gdk2/gdk2-Input-Devices.html#GdkDevice"><span class="type">GdkDevice</span></a> and
-      a <a href="http://library.gnome.org/devel/gdk2/gdk2-Windows.html#GdkWindow"><span class="type">GdkWindow</span></a>, which in turn represents a windowing system surface in the
+      When a GDK backend produces an input event, it is tied to a <a href="http://developer.gnome.org/gdk3/GdkDevice.html#GdkDevice-struct"><span class="type">GdkDevice</span></a> and
+      a <a href="http://developer.gnome.org/gdk3/gdk4-Windows.html#GdkWindow-struct"><span class="type">GdkWindow</span></a>, which in turn represents a windowing system surface in the
       backend. If a widget has grabbed the current input device, or all input
       devices, the event is propagated to that <a class="link" href="GtkWidget.html" title="GtkWidget"><span class="type">GtkWidget</span></a>. Otherwise, it is
       propagated to the the <a class="link" href="GtkWidget.html" title="GtkWidget"><span class="type">GtkWidget</span></a> which called <a class="link" href="GtkWidget.html#gtk-widget-register-window" title="gtk_widget_register_window ()"><code class="function">gtk_widget_register_window()</code></a>
-      on the <a href="http://library.gnome.org/devel/gdk2/gdk2-Windows.html#GdkWindow"><span class="type">GdkWindow</span></a> receiving the event.
+      on the <a href="http://developer.gnome.org/gdk3/gdk4-Windows.html#GdkWindow-struct"><span class="type">GdkWindow</span></a> receiving the event.
     </p>
 <p>
       Grabs are implemented for each input device, and globally. A grab for a
       specific input device (<a class="link" href="gtk3-General.html#gtk-device-grab-add" title="gtk_device_grab_add ()"><code class="function">gtk_device_grab_add()</code></a>), is sent events in
       preference to a global grab (<a class="link" href="gtk3-General.html#gtk-grab-add" title="gtk_grab_add ()"><code class="function">gtk_grab_add()</code></a>). Input grabs only have effect
       within the <a class="link" href="GtkWindowGroup.html" title="GtkWindowGroup"><span class="type">GtkWindowGroup</span></a> containing the <a class="link" href="GtkWidget.html" title="GtkWidget"><span class="type">GtkWidget</span></a> which registered the
-      event’s <a href="http://library.gnome.org/devel/gdk2/gdk2-Windows.html#GdkWindow"><span class="type">GdkWindow</span></a>. If this <a class="link" href="GtkWidget.html" title="GtkWidget"><span class="type">GtkWidget</span></a> is a child of the grab widget, the
+      event’s <a href="http://developer.gnome.org/gdk3/gdk4-Windows.html#GdkWindow-struct"><span class="type">GdkWindow</span></a>. If this <a class="link" href="GtkWidget.html" title="GtkWidget"><span class="type">GtkWidget</span></a> is a child of the grab widget, the
       event is propagated to the child — this is the basis for propagating
       events within modal dialogs.
     </p>
 <p>
       An event is propagated to a widget using <a class="link" href="gtk3-General.html#gtk-propagate-event" title="gtk_propagate_event ()"><code class="function">gtk_propagate_event()</code></a>.
-      Propagation differs between event types: key events (<a href="http://developer.gnome.org/gdk3/gdk3-Events.html#GDK-KEY-PRESS:CAPS"><code class="literal">GDK_KEY_PRESS</code></a>,
-      <a href="http://developer.gnome.org/gdk3/gdk3-Events.html#GDK-KEY-RELEASE:CAPS"><code class="literal">GDK_KEY_RELEASE</code></a>) are delivered to the top-level <a class="link" href="GtkWindow.html" title="GtkWindow"><span class="type">GtkWindow</span></a>; other events
+      Propagation differs between event types: key events (<a href="http://developer.gnome.org/gdk3/gdk4-Events.html#GDK-KEY-PRESS:CAPS"><code class="literal">GDK_KEY_PRESS</code></a>,
+      <a href="http://developer.gnome.org/gdk3/gdk4-Events.html#GDK-KEY-RELEASE:CAPS"><code class="literal">GDK_KEY_RELEASE</code></a>) are delivered to the top-level <a class="link" href="GtkWindow.html" title="GtkWindow"><span class="type">GtkWindow</span></a>; other events
       are propagated down and up the widget hierarchy in three phases (see
       <a class="link" href="GtkEventController.html#GtkPropagationPhase" title="enum GtkPropagationPhase"><span class="type">GtkPropagationPhase</span></a>).
     </p>
@@ -173,7 +173,7 @@
 <p>
       Any time during the propagation phase, a widget may indicate that a
       received event was consumed and propagation should therefore be stopped.
-      In traditional event handlers, this is hinted by returning <a href="http://developer.gnome.org/gdk3/gdk3-Events.html#GDK-EVENT-STOP:CAPS"><code class="literal">GDK_EVENT_STOP</code></a>.
+      In traditional event handlers, this is hinted by returning <a href="http://developer.gnome.org/gdk3/gdk4-Events.html#GDK-EVENT-STOP:CAPS"><code class="literal">GDK_EVENT_STOP</code></a>.
       If gestures are used, this may happen when the widget tells the gesture
       to claim the event touch sequence (or the pointer events) for its own. See the
       "gesture states" section below to know more of the latter.
@@ -186,21 +186,21 @@
       Each widget instance has a basic event mask and another per input device,
       which determine the types of input event it receives. Each event mask set
       on a widget is added to the corresponding (basic or per-device) event mask
-      for the widget’s <a href="http://library.gnome.org/devel/gdk2/gdk2-Windows.html#GdkWindow"><span class="type">GdkWindow</span></a>, and all child <a href="http://library.gnome.org/devel/gdk2/gdk2-Windows.html#GdkWindow"><span class="type">GdkWindows</span></a>.
+      for the widget’s <a href="http://developer.gnome.org/gdk3/gdk4-Windows.html#GdkWindow-struct"><span class="type">GdkWindow</span></a>, and all child <a href="http://developer.gnome.org/gdk3/gdk4-Windows.html#GdkWindow-struct"><span class="type">GdkWindows</span></a>.
     </p>
 <p>
-      If a widget is windowless (<a class="link" href="GtkWidget.html#gtk-widget-get-has-window" title="gtk_widget_get_has_window ()"><code class="function">gtk_widget_get_has_window()</code></a> returns <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a>) and
+      If a widget is windowless (<a class="link" href="GtkWidget.html#gtk-widget-get-has-window" title="gtk_widget_get_has_window ()"><code class="function">gtk_widget_get_has_window()</code></a> returns <a href="/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/share/gtk-doc/html/glib/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a>) and
       an application wants to receive custom events on it, it must be placed
       inside a <a class="link" href="GtkEventBox.html" title="GtkEventBox"><span class="type">GtkEventBox</span></a> to receive the events, and an appropriate event mask
-      must be set on the box. When implementing a widget, use a <a href="http://developer.gnome.org/gdk3/gdk3-Windows.html#GDK-INPUT-ONLY:CAPS"><code class="literal">GDK_INPUT_ONLY</code></a>
-      <a href="http://library.gnome.org/devel/gdk2/gdk2-Windows.html#GdkWindow"><span class="type">GdkWindow</span></a> to receive the events instead.
+      must be set on the box. When implementing a widget, use a <a href="http://developer.gnome.org/gdk3/gdk4-Windows.html#GDK-INPUT-ONLY:CAPS"><code class="literal">GDK_INPUT_ONLY</code></a>
+      <a href="http://developer.gnome.org/gdk3/gdk4-Windows.html#GdkWindow-struct"><span class="type">GdkWindow</span></a> to receive the events instead.
     </p>
 <p>
-      Filtering events against event masks happens inside <a href="http://library.gnome.org/devel/gdk2/gdk2-Windows.html#GdkWindow"><span class="type">GdkWindow</span></a>, which
+      Filtering events against event masks happens inside <a href="http://developer.gnome.org/gdk3/gdk4-Windows.html#GdkWindow-struct"><span class="type">GdkWindow</span></a>, which
       exposes event masks to the windowing system to reduce the number of events
       GDK receives from it. On receiving an event, it is filtered against the
-      <a href="http://library.gnome.org/devel/gdk2/gdk2-Windows.html#GdkWindow"><span class="type">GdkWindow</span></a>’s mask for the input device, if set. Otherwise, it is filtered
-      against the <a href="http://library.gnome.org/devel/gdk2/gdk2-Windows.html#GdkWindow"><span class="type">GdkWindow</span></a>’s basic event mask.
+      <a href="http://developer.gnome.org/gdk3/gdk4-Windows.html#GdkWindow-struct"><span class="type">GdkWindow</span></a>’s mask for the input device, if set. Otherwise, it is filtered
+      against the <a href="http://developer.gnome.org/gdk3/gdk4-Windows.html#GdkWindow-struct"><span class="type">GdkWindow</span></a>’s basic event mask.
     </p>
 <p>
       This means that widgets must add to the event mask for each event type
@@ -221,23 +221,23 @@
 <div class="refsect2">
 <a name="id-1.2.7.3.6"></a><h3>Touch events</h3>
 <p>
-      Touch events are emitted as events of type <a href="http://developer.gnome.org/gdk3/gdk3-Events.html#GDK-TOUCH-BEGIN:CAPS"><code class="literal">GDK_TOUCH_BEGIN</code></a>, <a href="http://developer.gnome.org/gdk3/gdk3-Events.html#GDK-TOUCH-UPDATE:CAPS"><code class="literal">GDK_TOUCH_UPDATE</code></a> or
-      <a href="http://developer.gnome.org/gdk3/gdk3-Events.html#GDK-TOUCH-END:CAPS"><code class="literal">GDK_TOUCH_END</code></a>, those events contain an “event sequence” that univocally identifies
+      Touch events are emitted as events of type <a href="http://developer.gnome.org/gdk3/gdk4-Events.html#GDK-TOUCH-BEGIN:CAPS"><code class="literal">GDK_TOUCH_BEGIN</code></a>, <a href="http://developer.gnome.org/gdk3/gdk4-Events.html#GDK-TOUCH-UPDATE:CAPS"><code class="literal">GDK_TOUCH_UPDATE</code></a> or
+      <a href="http://developer.gnome.org/gdk3/gdk4-Events.html#GDK-TOUCH-END:CAPS"><code class="literal">GDK_TOUCH_END</code></a>, those events contain an “event sequence” that univocally identifies
       the physical touch until it is lifted from the device.
     </p>
 <p>
       On some windowing platforms, multitouch devices perform pointer emulation, this works
       by granting a “pointer emulating” hint to one of the currently interacting touch
-      sequences, which will be reported on every <a href="http://developer.gnome.org/gdk3/gdk3-Event-Structures.html#GdkEventTouch"><span class="type">GdkEventTouch</span></a> event from that sequence. By
-      default, if a widget didn't request touch events by setting <a href="http://developer.gnome.org/gdk3/gdk3-Events.html#GDK-TOUCH-MASK:CAPS"><code class="literal">GDK_TOUCH_MASK</code></a> on its
+      sequences, which will be reported on every <a href="http://developer.gnome.org/gdk3/gdk4-Event-Structures.html#GdkEventTouch"><span class="type">GdkEventTouch</span></a> event from that sequence. By
+      default, if a widget didn't request touch events by setting <a href="http://developer.gnome.org/gdk3/gdk4-Events.html#GDK-TOUCH-MASK:CAPS"><code class="literal">GDK_TOUCH_MASK</code></a> on its
       event mask and didn't override <a class="link" href="GtkWidget.html#GtkWidget-touch-event" title="The “touch-event” signal"><span class="type">“touch-event”</span></a>, GTK+ will transform these
-      “pointer emulating” events into semantically similar <a href="http://developer.gnome.org/gdk3/gdk3-Event-Structures.html#GdkEventButton"><span class="type">GdkEventButton</span></a> and <a href="http://developer.gnome.org/gdk3/gdk3-Event-Structures.html#GdkEventMotion"><span class="type">GdkEventMotion</span></a>
-      events. Depending on <a href="http://developer.gnome.org/gdk3/gdk3-Events.html#GDK-TOUCH-MASK:CAPS"><code class="literal">GDK_TOUCH_MASK</code></a> being in the event mask or not, non-pointer-emulating
+      “pointer emulating” events into semantically similar <a href="http://developer.gnome.org/gdk3/gdk4-Event-Structures.html#GdkEventButton"><span class="type">GdkEventButton</span></a> and <a href="http://developer.gnome.org/gdk3/gdk4-Event-Structures.html#GdkEventMotion"><span class="type">GdkEventMotion</span></a>
+      events. Depending on <a href="http://developer.gnome.org/gdk3/gdk4-Events.html#GDK-TOUCH-MASK:CAPS"><code class="literal">GDK_TOUCH_MASK</code></a> being in the event mask or not, non-pointer-emulating
       sequences could still trigger gestures or just get filtered out, regardless of the widget
       not handling those directly.
     </p>
 <p>
-      If the widget sets <a href="http://developer.gnome.org/gdk3/gdk3-Events.html#GDK-TOUCH-MASK:CAPS"><code class="literal">GDK_TOUCH_MASK</code></a> on its event mask and doesn't chain up on
+      If the widget sets <a href="http://developer.gnome.org/gdk3/gdk4-Events.html#GDK-TOUCH-MASK:CAPS"><code class="literal">GDK_TOUCH_MASK</code></a> on its event mask and doesn't chain up on
       <a class="link" href="GtkWidget.html#GtkWidget-touch-event" title="The “touch-event” signal"><span class="type">“touch-event”</span></a>, only touch events will be received, and no pointer emulation
       will be performed.
     </p>
@@ -251,8 +251,8 @@
       happen on user interaction, when a <span class="type">GdkEventButtonPress</span> happens, all events from
       then on, until after the corresponding <span class="type">GdkEventButtonRelease</span>, will be reported
       to the widget that got the first event. Likewise, on touch events, every
-      <a href="http://developer.gnome.org/gdk3/gdk3-Events.html#GdkEventSequence"><span class="type">GdkEventSequence</span></a> will deliver only events to the widget that received its
-      <a href="http://developer.gnome.org/gdk3/gdk3-Events.html#GDK-TOUCH-BEGIN:CAPS"><code class="literal">GDK_TOUCH_BEGIN</code></a> event.
+      <a href="http://developer.gnome.org/gdk3/gdk4-Events.html#GdkEventSequence"><span class="type">GdkEventSequence</span></a> will deliver only events to the widget that received its
+      <a href="http://developer.gnome.org/gdk3/gdk4-Events.html#GDK-TOUCH-BEGIN:CAPS"><code class="literal">GDK_TOUCH_BEGIN</code></a> event.
     </p>
 <p>
       Explicit grabs happen programatically (both activation and deactivation),
@@ -268,7 +268,7 @@
       This makes it necessary for widgets to handle the cancellation of any ongoing
       interaction. Depending on whether a GTK or GDK grab is causing this, the
       widget will respectively receive a <a class="link" href="GtkWidget.html#GtkWidget-grab-notify" title="The “grab-notify” signal"><span class="type">“grab-notify”</span></a> signal, or a
-      <a href="http://developer.gnome.org/gdk3/gdk3-Event-Structures.html#GdkEventGrabBroken"><span class="type">GdkEventGrabBroken</span></a> event.
+      <a href="http://developer.gnome.org/gdk3/gdk4-Event-Structures.html#GdkEventGrabBroken"><span class="type">GdkEventGrabBroken</span></a> event.
     </p>
 <p>
       On gestures, these signals are handled automatically, causing the gesture
@@ -284,7 +284,7 @@
 <a name="event-controllers-and-gestures"></a><h3>Event controllers and gestures</h3>
 <p>
       Event controllers are standalone objects that can perform specific actions
-      upon received <a href="http://developer.gnome.org/gdk3/gdk3-Event-Structures.html#GdkEvent"><span class="type">GdkEvents</span></a>. These are tied to a <a class="link" href="GtkWidget.html" title="GtkWidget"><span class="type">GtkWidget</span></a>, and can be told of
+      upon received <a href="http://developer.gnome.org/gdk3/gdk4-Event-Structures.html#GdkEvent"><span class="type">GdkEvents</span></a>. These are tied to a <a class="link" href="GtkWidget.html" title="GtkWidget"><span class="type">GtkWidget</span></a>, and can be told of
       the event propagation phase at which they will manage the events.
     </p>
 <p>
@@ -338,7 +338,7 @@
       Alternatively, or at a later point in time, the widget may choose to deny the touch
       sequences, thus letting those go through again in event propagation. When this happens
       in the capture phase, and if there are no other claiming gestures in the widget,
-      a <a href="http://developer.gnome.org/gdk3/gdk3-Events.html#GDK-TOUCH-BEGIN:CAPS"><code class="literal">GDK_TOUCH_BEGIN</code></a>/<a href="http://developer.gnome.org/gdk3/gdk3-Events.html#GDK-BUTTON-PRESS:CAPS"><code class="literal">GDK_BUTTON_PRESS</code></a> event will be emulated and
+      a <a href="http://developer.gnome.org/gdk3/gdk4-Events.html#GDK-TOUCH-BEGIN:CAPS"><code class="literal">GDK_TOUCH_BEGIN</code></a>/<a href="http://developer.gnome.org/gdk3/gdk4-Events.html#GDK-BUTTON-PRESS:CAPS"><code class="literal">GDK_BUTTON_PRESS</code></a> event will be emulated and
       propagated downwards, in order to preserve consistency.
     </p>
 <p>

data/vendor/local/share/gtk-doc/html/gtk3/checklist-gdkeventexpose-region.html

@@ -50,7 +50,7 @@
       Regions have an internal representation that is accessible as a
       list of rectangles.  To turn the
       <em class="structfield"><code>GdkEventExpose.region</code></em> field into such
-      a list, use <a href="http://library.gnome.org/devel/gdk2/gdk2-Points-Rectangles-and-Regions.html#gdk-region-get-rectangles"><code class="function">gdk_region_get_rectangles()</code></a>:
+      a list, use <code class="function">gdk_region_get_rectangles()</code>:
     </p>
 <a name="gdkregion-get-rectangles"></a><pre class="programlisting">
 static gboolean

data/vendor/local/share/gtk-doc/html/gtk3/checklist-named-icons.html

@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="GTK+ 3 Reference Manual">
 <link rel="up" href="gtk-migrating-checklist.html" title="Migration Details Checklist">
 <link rel="prev" href="checklist-modifiers.html" title="Test for modifier keys correctly">
-<link rel="next" href="pt06.html" title="Part VI. GTK+ Tools">
+<link rel="next" href="gtk-migrating-3-x-to-y.html" title="Migrating from one GTK+ 3 release to another">
 <meta name="generator" content="GTK-Doc V1.25.1 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
@@ -17,7 +17,7 @@
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="gtk-migrating-checklist.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
 <td><a accesskey="p" href="checklist-modifiers.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
-<td><a accesskey="n" href="pt06.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+<td><a accesskey="n" href="gtk-migrating-3-x-to-y.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="section">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">

data/vendor/local/share/gtk-doc/html/gtk3/glossary.html

@@ -135,7 +135,7 @@
 	actually shows the GdkWindows it created when it was
 	<a class="glossterm" href="glossary.html#realization"><em class="glossterm"><a class="glossterm" href="glossary.html#realization" title="realization">realized</a></em></a>.  When a
 	widget is mapped, it must turn on its
-	%GTK_MAPPED <a href="http://library.gnome.org/devel/gtk2/GtkWidget.html#GtkWidgetFlags">flag</a>.
+	%GTK_MAPPED flag.
       </p>
 <p>
 	Note that due to the asynchronous nature of the X window
@@ -205,7 +205,7 @@
 	also attach a <a class="glossterm" href="glossary.html#style"><em class="glossterm"><a class="glossterm" href="glossary.html#style" title="style">style</a></em></a> to
 	it.  A widget becomes unrealized by destroying its associated
 	GdkWindow.  When a widget is realized, it must turn on its
-	%GTK_REALIZED <a href="http://library.gnome.org/devel/gtk2/GtkWidget.html#GtkWidgetFlags">flag</a>.
+	%GTK_REALIZED flag.
       </p>
 <p>
 	Widgets that don't own the GdkWindow on which they draw are

data/vendor/local/share/gtk-doc/html/gtk3/gtk-compiling.html

@@ -67,12 +67,12 @@ Deprecated GTK+ functions are annotated to make the compiler
 emit warnings when they are used (e.g. with gcc, you need to use
 the -Wdeprecated-declarations option). If these warnings are
 problematic, they can be turned off by defining the preprocessor
-symbol <a href="http://developer.gnome.org/gdk3/gdk3-General.html#GDK-DISABLE-DEPRECATION-WARNINGS:CAPS"><code class="literal">GDK_DISABLE_DEPRECATION_WARNINGS</code></a> by using the commandline
+symbol <code class="literal">GDK_DISABLE_DEPRECATION_WARNINGS</code> by using the commandline
 option <code class="literal">-DGDK_DISABLE_DEPRECATION_WARNINGS</code>
 </p>
 <p>
 GTK+ deprecation annotations are versioned; by defining the
-macros <a href="http://developer.gnome.org/gdk3/gdk3-General.html#GDK-VERSION-MIN-REQUIRED:CAPS"><code class="literal">GDK_VERSION_MIN_REQUIRED</code></a> and <a href="http://developer.gnome.org/gdk3/gdk3-General.html#GDK-VERSION-MAX-ALLOWED:CAPS"><code class="literal">GDK_VERSION_MAX_ALLOWED</code></a>,
+macros <a href="http://developer.gnome.org/gdk3/gdk4-General.html#GDK-VERSION-MIN-REQUIRED:CAPS"><code class="literal">GDK_VERSION_MIN_REQUIRED</code></a> and <a href="http://developer.gnome.org/gdk3/gdk4-General.html#GDK-VERSION-MAX-ALLOWED:CAPS"><code class="literal">GDK_VERSION_MAX_ALLOWED</code></a>,
 you can specify the range of GTK+ versions whose API you want
 to use. APIs that were deprecated before or introduced after
 this range will trigger compiler warnings.

data/vendor/local/share/gtk-doc/html/gtk3/gtk-getting-started.html

@@ -134,7 +134,7 @@ main (int    argc,
     is connected to the <code class="function">activate()</code> function above the <code class="function">main()</code> functions.
     The <code class="varname">activate</code> signal will be sent
     when your application is launched with
-    <a href="https://developer.gnome.org/gio/unstable/GApplication.html#g-application-run"><code class="function">g_application_run()</code></a> on the line below.
+    <a href="/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/share/gtk-doc/html/gio/GApplication.html#g-application-run"><code class="function">g_application_run()</code></a> on the line below.
     The <code class="function">gtk_application_run()</code> also takes as arguments the pointers to the command line arguments
     counter and string array; this allows GTK+ to parse specific command line
     arguments that control the behavior of GTK+ itself. The parsed arguments
@@ -166,9 +166,9 @@ main (int    argc,
 <p>Finally the window size is set using gtk_window_set_default_size and
     the window is then shown by GTK via <a class="link" href="GtkWidget.html#gtk-widget-show-all" title="gtk_widget_show_all ()"><code class="function">gtk_widget_show_all()</code></a>.</p>
 <p>When you exit the window, by for example pressing the X,
-    the <a href="https://developer.gnome.org/gio/unstable/GApplication.html#g-application-run"><code class="function">g_application_run()</code></a> in the main loop returns with a number
+    the <a href="/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/share/gtk-doc/html/gio/GApplication.html#g-application-run"><code class="function">g_application_run()</code></a> in the main loop returns with a number
     which is saved inside an integer named "status". Afterwards, the
-    <a class="link" href="GtkApplication.html" title="GtkApplication"><span class="type">GtkApplication</span></a> object is freed from memory with <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#g-object-unref"><code class="function">g_object_unref()</code></a>.
+    <a class="link" href="GtkApplication.html" title="GtkApplication"><span class="type">GtkApplication</span></a> object is freed from memory with <a href="/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#g-object-unref"><code class="function">g_object_unref()</code></a>.
     Finally the status integer is returned and the GTK application exits.</p>
 <p>While the program is running, GTK+ is receiving
     <em class="firstterm">events</em>. These are typically input events caused by
@@ -262,17 +262,17 @@ main (int    argc,
   Using g_signal_connect the button is connected to a function in our app called
   <code class="function">print_hello()</code>, so that when the button is clicked, GTK will call this function.
   As the <code class="function">print_hello()</code> function does not use any data as input, NULL is passed
-  to it. <code class="function">print_hello()</code> calls <a href="https://developer.gnome.org/glib/unstable/glib-Warnings-and-Assertions.html#g-print"><code class="function">g_print()</code></a> with the string "Hello World"
+  to it. <code class="function">print_hello()</code> calls <a href="/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/share/gtk-doc/html/glib/glib-Warnings-and-Assertions.html#g-print"><code class="function">g_print()</code></a> with the string "Hello World"
   which will print Hello World in a terminal if the GTK application was started
   from one.</p>
 <p>After connecting <code class="function">print_hello()</code>, another signal is connected to the "clicked" state
-  of the button using <a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#g-signal-connect-swapped"><code class="function">g_signal_connect_swapped()</code></a>. This functions is similar to
-  a <a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#g-signal-connect"><code class="function">g_signal_connect()</code></a> with the difference lying in how the callback function is
-  treated. <a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#g-signal-connect-swapped"><code class="function">g_signal_connect_swapped()</code></a> allow you to specify what the callback
+  of the button using <a href="/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/share/gtk-doc/html/gobject/gobject-Signals.html#g-signal-connect-swapped"><code class="function">g_signal_connect_swapped()</code></a>. This functions is similar to
+  a <a href="/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/share/gtk-doc/html/gobject/gobject-Signals.html#g-signal-connect"><code class="function">g_signal_connect()</code></a> with the difference lying in how the callback function is
+  treated. <a href="/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/share/gtk-doc/html/gobject/gobject-Signals.html#g-signal-connect-swapped"><code class="function">g_signal_connect_swapped()</code></a> allow you to specify what the callback
   function should take as parameter by letting you pass it as data. In this case
   the function being called back is <a class="link" href="GtkWidget.html#gtk-widget-destroy" title="gtk_widget_destroy ()"><code class="function">gtk_widget_destroy()</code></a> and the <code class="varname">window</code>
   pointer is passed to it. This has the effect that when the button is clicked,
-  the whole GTK window is destroyed. In contrast if a normal <a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#g-signal-connect"><code class="function">g_signal_connect()</code></a> were used
+  the whole GTK window is destroyed. In contrast if a normal <a href="/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/share/gtk-doc/html/gobject/gobject-Signals.html#g-signal-connect"><code class="function">g_signal_connect()</code></a> were used
   to connect the "clicked" signal with <a class="link" href="GtkWidget.html#gtk-widget-destroy" title="gtk_widget_destroy ()"><code class="function">gtk_widget_destroy()</code></a>, then the <code class="varname">button</code>
   itself would have been destroyed, not the window.
   More information about creating buttons can be found

data/vendor/local/share/gtk-doc/html/gtk3/gtk-migrating-2-to-3.html

@@ -156,7 +156,7 @@
     Note that some parts of our API, such as enumeration values, are
     not well covered by the deprecation warnings. In most cases, using
     them will require you to also use deprecated functions, which will
-    trigger warnings. But some things, like the <a href="http://library.gnome.org/devel/gtk2/GtkDialog.html#GTK-DIALOG-NO-SEPARATOR:CAPS"><code class="literal">GTK_DIALOG_NO_SEPARATOR</code></a>
+    trigger warnings. But some things, like the <code class="literal">GTK_DIALOG_NO_SEPARATOR</code>
     flag that has disappeared in GTK+ 3, may not.
   </p>
 </div>
@@ -204,14 +204,14 @@
 6
 7
 8</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="keyword">static</span><span class="normal"> </span><span class="type">void</span>
-<span class="function">on_toggled</span><span class="normal"> </span><span class="symbol">(</span><span class="usertype">GtkToggleButton</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">button</span><span class="symbol">)</span>
-<span class="cbracket">{</span>
-<span class="normal">  </span><span class="keyword">if</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">button</span><span class="symbol">-&gt;</span><span class="normal">active</span><span class="symbol">)</span>
-<span class="normal">    </span><span class="function">frob_active</span><span class="normal"> </span><span class="symbol">();</span>
-<span class="normal">  </span><span class="keyword">else</span>
-<span class="normal">    </span><span class="function">frob_inactive</span><span class="normal"> </span><span class="symbol">();</span>
-<span class="cbracket">}</span></pre></td>
+        <td class="listing_code"><pre class="programlisting"><span class="gtkdoc kwb">static void</span>
+<span class="function">on_toggled</span> <span class="gtkdoc opt">(</span>GtkToggleButton <span class="gtkdoc opt">*</span>button<span class="gtkdoc opt">)</span>
+<span class="gtkdoc opt">{</span>
+  <span class="keyword">if</span> <span class="gtkdoc opt">(</span>button<span class="gtkdoc opt">-&gt;</span>active<span class="gtkdoc opt">)</span>
+    <span class="function">frob_active</span> <span class="gtkdoc opt">();</span>
+  <span class="keyword">else</span>
+    <span class="function">frob_inactive</span> <span class="gtkdoc opt">();</span>
+<span class="gtkdoc opt">}</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -237,14 +237,14 @@
 6
 7
 8</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="keyword">static</span><span class="normal"> </span><span class="type">void</span>
-<span class="function">on_toggled</span><span class="normal"> </span><span class="symbol">(</span><span class="usertype">GtkToggleButton</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">button</span><span class="symbol">)</span>
-<span class="cbracket">{</span>
-<span class="normal">  </span><span class="keyword">if</span><span class="normal"> </span><span class="symbol">(</span><span class="function"><a href="GtkToggleButton.html#gtk-toggle-button-get-active">gtk_toggle_button_get_active</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">button</span><span class="symbol">))</span>
-<span class="normal">    </span><span class="function">frob_active</span><span class="normal"> </span><span class="symbol">();</span>
-<span class="normal">  </span><span class="keyword">else</span>
-<span class="normal">    </span><span class="function">frob_inactive</span><span class="normal"> </span><span class="symbol">();</span>
-<span class="cbracket">}</span></pre></td>
+        <td class="listing_code"><pre class="programlisting"><span class="gtkdoc kwb">static void</span>
+<span class="function">on_toggled</span> <span class="gtkdoc opt">(</span>GtkToggleButton <span class="gtkdoc opt">*</span>button<span class="gtkdoc opt">)</span>
+<span class="gtkdoc opt">{</span>
+  <span class="keyword">if</span> <span class="gtkdoc opt">(</span><span class="function"><a href="GtkToggleButton.html#gtk-toggle-button-get-active">gtk_toggle_button_get_active</a></span> <span class="gtkdoc opt">(</span>button<span class="gtkdoc opt">))</span>
+    <span class="function">frob_active</span> <span class="gtkdoc opt">();</span>
+  <span class="keyword">else</span>
+    <span class="function">frob_inactive</span> <span class="gtkdoc opt">();</span>
+<span class="gtkdoc opt">}</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -283,7 +283,7 @@
         <a class="link" href="gtk3-Filesystem-utilities.html#gtk-show-uri" title="gtk_show_uri ()"><code class="function">gtk_show_uri()</code></a>; as an added benefit, your application will henceforth
         respect the users preference for what application to use.</li>
 <li class="listitem">If you are launching a regular, installed application that
-        has a desktop file, it is best to use GIOs <a href="https://developer.gnome.org/gio/unstable/GAppInfo.html#GAppInfo-struct"><span class="type">GAppInfo</span></a> with a suitable
+        has a desktop file, it is best to use GIOs <a href="/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/share/gtk-doc/html/gio/GAppInfo.html#GAppInfo-struct"><span class="type">GAppInfo</span></a> with a suitable
         launch context.
         <div class="informalexample">
   <table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
@@ -305,22 +305,22 @@
 14
 15
 16</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="usertype">GAppInfo</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">info</span><span class="symbol">;</span>
-<span class="usertype">GAppLaunchContext</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">context</span><span class="symbol">;</span>
-<span class="usertype">GError</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">error </span><span class="symbol">=</span><span class="normal"> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS">NULL</a></span><span class="symbol">;</span>
+        <td class="listing_code"><pre class="programlisting">GAppInfo <span class="gtkdoc opt">*</span>info<span class="gtkdoc opt">;</span>
+GAppLaunchContext <span class="gtkdoc opt">*</span>context<span class="gtkdoc opt">;</span>
+GError <span class="gtkdoc opt">*</span>error <span class="gtkdoc opt">=</span> NULL<span class="gtkdoc opt">;</span>
 
-<span class="normal">info </span><span class="symbol">=</span><span class="normal"> </span><span class="symbol">(</span><span class="normal"><a href="https://developer.gnome.org/gio/unstable/GAppInfo.html#GAppInfo-struct">GAppInfo</a></span><span class="symbol">*)</span><span class="normal"> </span><span class="function"><a href="https://developer.gnome.org/gio/unstable/gio-Desktop-file-based-GAppInfo.html#g-desktop-app-info-new">g_desktop_app_info_new</a></span><span class="normal"> </span><span class="symbol">(</span><span class="string">"epiphany.desktop"</span><span class="symbol">);</span>
-<span class="normal">context </span><span class="symbol">=</span><span class="normal"> </span><span class="symbol">(</span><span class="normal"><a href="https://developer.gnome.org/gio/unstable/GAppInfo.html#GAppLaunchContext-struct">GAppLaunchContext</a></span><span class="symbol">*)</span><span class="normal"> </span><span class="function"><a href="http://developer.gnome.org/gdk3/GdkDisplay.html#gdk-display-get-app-launch-context">gdk_display_get_app_launch_context</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">display</span><span class="symbol">);</span>
-<span class="function"><a href="https://developer.gnome.org/gio/unstable/GAppInfo.html#g-app-info-launch">g_app_info_launch</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">info</span><span class="symbol">,</span><span class="normal"> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS">NULL</a></span><span class="symbol">,</span><span class="normal"> context</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">&amp;</span><span class="normal">error</span><span class="symbol">);</span>
+info <span class="gtkdoc opt">= (</span>GAppInfo<span class="gtkdoc opt">*)</span> <span class="function"><a href="/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/share/gtk-doc/html/gio/gio-Desktop-file-based-GAppInfo.html#g-desktop-app-info-new">g_desktop_app_info_new</a></span> <span class="gtkdoc opt">(</span><span class="string">&quot;epiphany.desktop&quot;</span><span class="gtkdoc opt">);</span>
+context <span class="gtkdoc opt">= (</span>GAppLaunchContext<span class="gtkdoc opt">*)</span> <span class="function"><a href="http://developer.gnome.org/gdk3/GdkDisplay.html#gdk-display-get-app-launch-context">gdk_display_get_app_launch_context</a></span> <span class="gtkdoc opt">(</span>display<span class="gtkdoc opt">);</span>
+<span class="function"><a href="/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/share/gtk-doc/html/gio/GAppInfo.html#g-app-info-launch">g_app_info_launch</a></span> <span class="gtkdoc opt">(</span>info<span class="gtkdoc opt">,</span> NULL<span class="gtkdoc opt">,</span> context<span class="gtkdoc opt">, &amp;</span>error<span class="gtkdoc opt">);</span>
 
-<span class="keyword">if</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">error</span><span class="symbol">)</span>
-<span class="normal">  </span><span class="cbracket">{</span>
-<span class="normal">    </span><span class="function"><a href="https://developer.gnome.org/glib/unstable/glib-Message-Logging.html#g-warning">g_warning</a></span><span class="normal"> </span><span class="symbol">(</span><span class="string">"Failed to launch epiphany: %s"</span><span class="symbol">,</span><span class="normal"> error</span><span class="symbol">-&gt;</span><span class="normal">message</span><span class="symbol">);</span>
-<span class="normal">    </span><span class="function"><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#g-error-free">g_error_free</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">error</span><span class="symbol">);</span>
-<span class="normal">  </span><span class="cbracket">}</span>
+<span class="keyword">if</span> <span class="gtkdoc opt">(</span>error<span class="gtkdoc opt">)</span>
+  <span class="gtkdoc opt">{</span>
+    <span class="function"><a href="/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/share/gtk-doc/html/glib/glib-Message-Logging.html#g-warning">g_warning</a></span> <span class="gtkdoc opt">(</span><span class="string">&quot;Failed to launch epiphany: %s&quot;</span><span class="gtkdoc opt">,</span> error<span class="gtkdoc opt">-&gt;</span>message<span class="gtkdoc opt">);</span>
+    <span class="function"><a href="/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/share/gtk-doc/html/glib/glib-Error-Reporting.html#g-error-free">g_error_free</a></span> <span class="gtkdoc opt">(</span>error<span class="gtkdoc opt">);</span>
+  <span class="gtkdoc opt">}</span>
 
-<span class="function"><a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#g-object-unref">g_object_unref</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">info</span><span class="symbol">);</span>
-<span class="function"><a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#g-object-unref">g_object_unref</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">context</span><span class="symbol">);</span></pre></td>
+<span class="function"><a href="/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#g-object-unref">g_object_unref</a></span> <span class="gtkdoc opt">(</span>info<span class="gtkdoc opt">);</span>
+<span class="function"><a href="/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#g-object-unref">g_object_unref</a></span> <span class="gtkdoc opt">(</span>context<span class="gtkdoc opt">);</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -329,14 +329,14 @@
         Remember that you have to include
         <code class="filename">gio/gdesktopappinfo.h</code>
         and use the <code class="filename">gio-unix-2.0</code> pkg-config file
-        when using <a href="https://developer.gnome.org/gio/unstable/gio-Desktop-file-based-GAppInfo.html#g-desktop-app-info-new"><code class="function">g_desktop_app_info_new()</code></a>.
+        when using <a href="/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/share/gtk-doc/html/gio/gio-Desktop-file-based-GAppInfo.html#g-desktop-app-info-new"><code class="function">g_desktop_app_info_new()</code></a>.
         </li>
 <li class="listitem">If you are launching a custom commandline, you can
-        still use <a href="https://developer.gnome.org/gio/unstable/GAppInfo.html#g-app-info-launch"><code class="function">g_app_info_launch()</code></a> with a GAppInfo that is constructed
-        with <a href="https://developer.gnome.org/gio/unstable/GAppInfo.html#g-app-info-create-from-commandline"><code class="function">g_app_info_create_from_commandline()</code></a>, or you can use the
+        still use <a href="/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/share/gtk-doc/html/gio/GAppInfo.html#g-app-info-launch"><code class="function">g_app_info_launch()</code></a> with a GAppInfo that is constructed
+        with <a href="/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/share/gtk-doc/html/gio/GAppInfo.html#g-app-info-create-from-commandline"><code class="function">g_app_info_create_from_commandline()</code></a>, or you can use the
         more lowlevel <code class="literal">g_spawn</code> family of functions
-        (e.g. <a href="https://developer.gnome.org/glib/unstable/glib-Spawning-Processes.html#g-spawn-command-line-async"><code class="function">g_spawn_command_line_async()</code></a>), and pass <code class="envar">DISPLAY</code>
-        in the environment. <a href="http://developer.gnome.org/gdk3/GdkScreen.html#gdk-screen-make-display-name"><code class="function">gdk_screen_make_display_name()</code></a> can be
+        (e.g. <a href="/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/share/gtk-doc/html/glib/glib-Spawning-Processes.html#g-spawn-command-line-async"><code class="function">g_spawn_command_line_async()</code></a>), and pass <code class="envar">DISPLAY</code>
+        in the environment. <code class="function">gdk_screen_make_display_name()</code> can be
         used to find the right value for the <code class="envar">DISPLAY</code>
         environment variable.
         </li>
@@ -353,10 +353,10 @@
       removed. All drawing in GTK+ 3 is done via cairo.
     </p>
 <p>
-      The <a href="http://library.gnome.org/devel/gdk2/gdk2-Graphics-Contexts.html#GdkGC-struct"><span class="type">GdkGC</span></a> and <a href="http://library.gnome.org/devel/gdk2/gdk2-Images.html#GdkImage"><span class="type">GdkImage</span></a> objects, as well as all the functions using
+      The <span class="type">GdkGC</span> and <span class="type">GdkImage</span> objects, as well as all the functions using
       them, are gone. This includes the <code class="literal">gdk_draw</code> family
-      of functions like <a href="http://library.gnome.org/devel/gdk2/gdk2-Drawing-Primitives.html#gdk-draw-rectangle"><code class="function">gdk_draw_rectangle()</code></a> and <a href="http://library.gnome.org/devel/gdk2/gdk2-Drawing-Primitives.html#gdk-draw-drawable"><code class="function">gdk_draw_drawable()</code></a>. As
-      <a href="http://library.gnome.org/devel/gdk2/gdk2-Graphics-Contexts.html#GdkGC-struct"><span class="type">GdkGC</span></a> is roughly equivalent to <span class="type">cairo_t</span> and <a href="http://library.gnome.org/devel/gdk2/gdk2-Images.html#GdkImage"><span class="type">GdkImage</span></a> was used for
+      of functions like <code class="function">gdk_draw_rectangle()</code> and <code class="function">gdk_draw_drawable()</code>. As
+      <span class="type">GdkGC</span> is roughly equivalent to <span class="type">cairo_t</span> and <span class="type">GdkImage</span> was used for
       drawing images to GdkWindows, which cairo supports automatically,
       a transition is usually straightforward.
     </p>
@@ -384,15 +384,15 @@
 7
 8
 9</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="function"><a href="http://library.gnome.org/devel/gdk2/gdk2-Drawing-Primitives.html#gdk-draw-pixbuf">gdk_draw_pixbuf</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">window</span><span class="symbol">,</span>
-<span class="normal">                 </span><span class="function"><a href="GtkWidget.html#gtk-widget-get-style">gtk_widget_get_style</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">widget</span><span class="symbol">)-&gt;</span><span class="normal">black_gc</span><span class="symbol">,</span>
-<span class="normal">                 pixbuf</span><span class="symbol">,</span>
-<span class="normal">                 </span><span class="number">0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0</span>
-<span class="normal">                 x</span><span class="symbol">,</span><span class="normal"> y</span><span class="symbol">,</span>
-<span class="normal">                 </span><span class="function"><a href="http://library.gnome.org/devel/gdk-pixbuf/unstable/gdk-pixbuf-The-GdkPixbuf-Structure.html#gdk-pixbuf-get-width">gdk_pixbuf_get_width</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">pixbuf</span><span class="symbol">),</span>
-<span class="normal">                 </span><span class="function"><a href="http://library.gnome.org/devel/gdk-pixbuf/unstable/gdk-pixbuf-The-GdkPixbuf-Structure.html#gdk-pixbuf-get-height">gdk_pixbuf_get_height</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">pixbuf</span><span class="symbol">),</span>
-<span class="normal">                 <a href="http://library.gnome.org/devel/gdk2/gdk2-GdkRGB.html#GDK-RGB-DITHER-NORMAL:CAPS">GDK_RGB_DITHER_NORMAL</a></span><span class="symbol">,</span>
-<span class="normal">                 </span><span class="number">0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0</span><span class="symbol">);</span></pre></td>
+        <td class="listing_code"><pre class="programlisting"><span class="function">gdk_draw_pixbuf</span> <span class="gtkdoc opt">(</span>window<span class="gtkdoc opt">,</span>
+                 <span class="function"><a href="GtkWidget.html#gtk-widget-get-style">gtk_widget_get_style</a></span> <span class="gtkdoc opt">(</span>widget<span class="gtkdoc opt">)-&gt;</span>black_gc<span class="gtkdoc opt">,</span>
+                 pixbuf<span class="gtkdoc opt">,</span>
+                 <span class="number">0</span><span class="gtkdoc opt">,</span> <span class="number">0</span>
+                 x<span class="gtkdoc opt">,</span> y<span class="gtkdoc opt">,</span>
+                 <span class="function">gdk_pixbuf_get_width</span> <span class="gtkdoc opt">(</span>pixbuf<span class="gtkdoc opt">),</span>
+                 <span class="function">gdk_pixbuf_get_height</span> <span class="gtkdoc opt">(</span>pixbuf<span class="gtkdoc opt">),</span>
+                 GDK_RGB_DITHER_NORMAL<span class="gtkdoc opt">,</span>
+                 <span class="number">0</span><span class="gtkdoc opt">,</span> <span class="number">0</span><span class="gtkdoc opt">);</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -409,10 +409,10 @@
 2
 3
 4</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="usertype">cairo_t</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">cr </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="http://developer.gnome.org/gdk3/gdk3-Cairo-Interaction.html#gdk-cairo-create">gdk_cairo_create</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">window</span><span class="symbol">);</span>
-<span class="function"><a href="http://developer.gnome.org/gdk3/gdk3-Cairo-Interaction.html#gdk-cairo-set-source-pixbuf">gdk_cairo_set_source_pixbuf</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">,</span><span class="normal"> pixbuf</span><span class="symbol">,</span><span class="normal"> x</span><span class="symbol">,</span><span class="normal"> y</span><span class="symbol">);</span>
-<span class="function">cairo_paint</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">);</span>
-<span class="function">cairo_destroy</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">);</span></pre></td>
+        <td class="listing_code"><pre class="programlisting">cairo_t <span class="gtkdoc opt">*</span>cr <span class="gtkdoc opt">=</span> <span class="function">gdk_cairo_create</span> <span class="gtkdoc opt">(</span>window<span class="gtkdoc opt">);</span>
+<span class="function"><a href="http://developer.gnome.org/gdk3/gdk4-Cairo-Interaction.html#gdk-cairo-set-source-pixbuf">gdk_cairo_set_source_pixbuf</a></span> <span class="gtkdoc opt">(</span>cr<span class="gtkdoc opt">,</span> pixbuf<span class="gtkdoc opt">,</span> x<span class="gtkdoc opt">,</span> y<span class="gtkdoc opt">);</span>
+<span class="function">cairo_paint</span> <span class="gtkdoc opt">(</span>cr<span class="gtkdoc opt">);</span>
+<span class="function">cairo_destroy</span> <span class="gtkdoc opt">(</span>cr<span class="gtkdoc opt">);</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -422,7 +422,7 @@
            Note that very similar code can be used when porting code
            using GdkPixmap to <span class="type">cairo_surface_t</span> by calling
            <code class="function">cairo_set_source_surface()</code> instead of
-           <a href="http://developer.gnome.org/gdk3/gdk3-Cairo-Interaction.html#gdk-cairo-set-source-pixbuf"><code class="function">gdk_cairo_set_source_pixbuf()</code></a>.
+           <a href="http://developer.gnome.org/gdk3/gdk4-Cairo-Interaction.html#gdk-cairo-set-source-pixbuf"><code class="function">gdk_cairo_set_source_pixbuf()</code></a>.
          </p>
 </div>
 </div>
@@ -451,20 +451,20 @@
 12
 13
 14</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="usertype">GdkGCValues</span><span class="normal"> gc_values</span><span class="symbol">;</span>
-<span class="usertype">GdkGC</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">gc</span><span class="symbol">;</span>
+        <td class="listing_code"><pre class="programlisting">GdkGCValues gc_values<span class="gtkdoc opt">;</span>
+GdkGC <span class="gtkdoc opt">*</span>gc<span class="gtkdoc opt">;</span>
 
 <span class="comment">/* setup */</span>
-<span class="normal">gc </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="GtkWidget.html#gtk-widget-get-style">gtk_widget_get_style</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">widget</span><span class="symbol">)-&gt;</span><span class="normal">black_gc</span><span class="symbol">;</span>
-<span class="function"><a href="http://library.gnome.org/devel/gdk2/gdk2-Graphics-Contexts.html#gdk-gc-set-tile">gdk_gc_set_tile</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">gc</span><span class="symbol">,</span><span class="normal"> pixmap</span><span class="symbol">);</span>
-<span class="function"><a href="http://library.gnome.org/devel/gdk2/gdk2-Graphics-Contexts.html#gdk-gc-set-fill">gdk_gc_set_fill</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">gc</span><span class="symbol">,</span><span class="normal"> <a href="http://library.gnome.org/devel/gdk2/gdk2-Graphics-Contexts.html#GDK-TILED:CAPS">GDK_TILED</a></span><span class="symbol">);</span>
-<span class="function"><a href="http://library.gnome.org/devel/gdk2/gdk2-Graphics-Contexts.html#gdk-gc-set-ts-origin">gdk_gc_set_ts_origin</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">gc</span><span class="symbol">,</span><span class="normal"> x_origin</span><span class="symbol">,</span><span class="normal"> y_origin</span><span class="symbol">);</span>
+gc <span class="gtkdoc opt">=</span> <span class="function"><a href="GtkWidget.html#gtk-widget-get-style">gtk_widget_get_style</a></span> <span class="gtkdoc opt">(</span>widget<span class="gtkdoc opt">)-&gt;</span>black_gc<span class="gtkdoc opt">;</span>
+<span class="function">gdk_gc_set_tile</span> <span class="gtkdoc opt">(</span>gc<span class="gtkdoc opt">,</span> pixmap<span class="gtkdoc opt">);</span>
+<span class="function">gdk_gc_set_fill</span> <span class="gtkdoc opt">(</span>gc<span class="gtkdoc opt">,</span> GDK_TILED<span class="gtkdoc opt">);</span>
+<span class="function">gdk_gc_set_ts_origin</span> <span class="gtkdoc opt">(</span>gc<span class="gtkdoc opt">,</span> x_origin<span class="gtkdoc opt">,</span> y_origin<span class="gtkdoc opt">);</span>
 <span class="comment">/* use */</span>
-<span class="function"><a href="http://library.gnome.org/devel/gdk2/gdk2-Drawing-Primitives.html#gdk-draw-rectangle">gdk_draw_rectangle</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">window</span><span class="symbol">,</span><span class="normal"> gc</span><span class="symbol">,</span><span class="normal"> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS">TRUE</a></span><span class="symbol">,</span><span class="normal"> </span><span class="number">0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0</span><span class="symbol">,</span><span class="normal"> width</span><span class="symbol">,</span><span class="normal"> height</span><span class="symbol">);</span>
+<span class="function">gdk_draw_rectangle</span> <span class="gtkdoc opt">(</span>window<span class="gtkdoc opt">,</span> gc<span class="gtkdoc opt">,</span> TRUE<span class="gtkdoc opt">,</span> <span class="number">0</span><span class="gtkdoc opt">,</span> <span class="number">0</span><span class="gtkdoc opt">,</span> width<span class="gtkdoc opt">,</span> height<span class="gtkdoc opt">);</span>
 <span class="comment">/* restore */</span>
-<span class="function"><a href="http://library.gnome.org/devel/gdk2/gdk2-Graphics-Contexts.html#gdk-gc-set-tile">gdk_gc_set_tile</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">gc</span><span class="symbol">,</span><span class="normal"> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS">NULL</a></span><span class="symbol">);</span>
-<span class="function"><a href="http://library.gnome.org/devel/gdk2/gdk2-Graphics-Contexts.html#gdk-gc-set-fill">gdk_gc_set_fill</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">gc</span><span class="symbol">,</span><span class="normal"> <a href="http://library.gnome.org/devel/gdk2/gdk2-Graphics-Contexts.html#GDK-SOLID:CAPS">GDK_SOLID</a></span><span class="symbol">);</span>
-<span class="function"><a href="http://library.gnome.org/devel/gdk2/gdk2-Graphics-Contexts.html#gdk-gc-set-ts-origin">gdk_gc_set_ts_origin</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">gc</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0</span><span class="symbol">);</span></pre></td>
+<span class="function">gdk_gc_set_tile</span> <span class="gtkdoc opt">(</span>gc<span class="gtkdoc opt">,</span> NULL<span class="gtkdoc opt">);</span>
+<span class="function">gdk_gc_set_fill</span> <span class="gtkdoc opt">(</span>gc<span class="gtkdoc opt">,</span> GDK_SOLID<span class="gtkdoc opt">);</span>
+<span class="function">gdk_gc_set_ts_origin</span> <span class="gtkdoc opt">(</span>gc<span class="gtkdoc opt">,</span> <span class="number">0</span><span class="gtkdoc opt">,</span> <span class="number">0</span><span class="gtkdoc opt">);</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -488,16 +488,16 @@
 8
 9
 10</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="usertype">cairo_t</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">cr</span><span class="symbol">;</span>
-<span class="usertype">cairo_surface_t</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">surface</span><span class="symbol">;</span>
+        <td class="listing_code"><pre class="programlisting">cairo_t <span class="gtkdoc opt">*</span>cr<span class="gtkdoc opt">;</span>
+cairo_surface_t <span class="gtkdoc opt">*</span>surface<span class="gtkdoc opt">;</span>
 
-<span class="normal">surface </span><span class="symbol">=</span><span class="normal"> </span><span class="symbol">...</span>
-<span class="normal">cr </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="http://developer.gnome.org/gdk3/gdk3-Cairo-Interaction.html#gdk-cairo-create">gdk_cairo_create</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">window</span><span class="symbol">);</span>
-<span class="function">cairo_set_source_surface</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">,</span><span class="normal"> surface</span><span class="symbol">,</span><span class="normal"> x_origin</span><span class="symbol">,</span><span class="normal"> y_origin</span><span class="symbol">);</span>
-<span class="function">cairo_pattern_set_extend</span><span class="normal"> </span><span class="symbol">(</span><span class="function">cairo_get_source</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">),</span><span class="normal"> CAIRO_EXTEND_REPEAT</span><span class="symbol">);</span>
-<span class="function">cairo_rectangle</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0</span><span class="symbol">,</span><span class="normal"> width</span><span class="symbol">,</span><span class="normal"> height</span><span class="symbol">);</span>
-<span class="function">cairo_fill</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">);</span>
-<span class="function">cairo_destroy</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">);</span></pre></td>
+surface <span class="gtkdoc opt">= ...</span>
+cr <span class="gtkdoc opt">=</span> <span class="function">gdk_cairo_create</span> <span class="gtkdoc opt">(</span>window<span class="gtkdoc opt">);</span>
+<span class="function">cairo_set_source_surface</span> <span class="gtkdoc opt">(</span>cr<span class="gtkdoc opt">,</span> surface<span class="gtkdoc opt">,</span> x_origin<span class="gtkdoc opt">,</span> y_origin<span class="gtkdoc opt">);</span>
+<span class="function">cairo_pattern_set_extend</span> <span class="gtkdoc opt">(</span><span class="function">cairo_get_source</span> <span class="gtkdoc opt">(</span>cr<span class="gtkdoc opt">),</span> CAIRO_EXTEND_REPEAT<span class="gtkdoc opt">);</span>
+<span class="function">cairo_rectangle</span> <span class="gtkdoc opt">(</span>cr<span class="gtkdoc opt">,</span> <span class="number">0</span><span class="gtkdoc opt">,</span> <span class="number">0</span><span class="gtkdoc opt">,</span> width<span class="gtkdoc opt">,</span> height<span class="gtkdoc opt">);</span>
+<span class="function">cairo_fill</span> <span class="gtkdoc opt">(</span>cr<span class="gtkdoc opt">);</span>
+<span class="function">cairo_destroy</span> <span class="gtkdoc opt">(</span>cr<span class="gtkdoc opt">);</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -507,7 +507,7 @@
 The surface here can be either an image surface or a X surface,
 and can either be created on the spot or kept around for caching purposes.
 Another alternative is to use pixbufs instead of surfaces with
-<a href="http://developer.gnome.org/gdk3/gdk3-Cairo-Interaction.html#gdk-cairo-set-source-pixbuf"><code class="function">gdk_cairo_set_source_pixbuf()</code></a> instead of <code class="function">cairo_set_source_surface()</code>.
+<a href="http://developer.gnome.org/gdk3/gdk4-Cairo-Interaction.html#gdk-cairo-set-source-pixbuf"><code class="function">gdk_cairo_set_source_pixbuf()</code></a> instead of <code class="function">cairo_set_source_surface()</code>.
         </p>
 </div>
 </div>
@@ -531,15 +531,15 @@ Another alternative is to use pixbufs instead of surfaces with
 7
 8
 9</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="usertype">GdkGC</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">gc</span><span class="symbol">;</span>
+        <td class="listing_code"><pre class="programlisting">GdkGC <span class="gtkdoc opt">*</span>gc<span class="gtkdoc opt">;</span>
 
 <span class="comment">/* setup */</span>
-<span class="normal">gc </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="GtkWidget.html#gtk-widget-get-style">gtk_widget_get_style</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">widget</span><span class="symbol">)-&gt;</span><span class="normal">text_gc</span><span class="symbol">[</span><span class="normal">state</span><span class="symbol">];</span>
-<span class="function"><a href="http://library.gnome.org/devel/gdk2/gdk2-Graphics-Contexts.html#gdk-gc-set-clip-rectangle">gdk_gc_set_clip_rectangle</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">gc</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">&amp;</span><span class="normal">area</span><span class="symbol">);</span>
+gc <span class="gtkdoc opt">=</span> <span class="function"><a href="GtkWidget.html#gtk-widget-get-style">gtk_widget_get_style</a></span> <span class="gtkdoc opt">(</span>widget<span class="gtkdoc opt">)-&gt;</span>text_gc<span class="gtkdoc opt">[</span>state<span class="gtkdoc opt">];</span>
+<span class="function">gdk_gc_set_clip_rectangle</span> <span class="gtkdoc opt">(</span>gc<span class="gtkdoc opt">, &amp;</span>area<span class="gtkdoc opt">);</span>
 <span class="comment">/* use */</span>
-<span class="function"><a href="http://library.gnome.org/devel/gdk2/gdk2-Drawing-Primitives.html#gdk-draw-layout">gdk_draw_layout</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">drawable</span><span class="symbol">,</span><span class="normal"> gc</span><span class="symbol">,</span><span class="normal"> x</span><span class="symbol">,</span><span class="normal"> y</span><span class="symbol">,</span><span class="normal"> layout</span><span class="symbol">);</span>
+<span class="function">gdk_draw_layout</span> <span class="gtkdoc opt">(</span>drawable<span class="gtkdoc opt">,</span> gc<span class="gtkdoc opt">,</span> x<span class="gtkdoc opt">,</span> y<span class="gtkdoc opt">,</span> layout<span class="gtkdoc opt">);</span>
 <span class="comment">/* restore */</span>
-<span class="function"><a href="http://library.gnome.org/devel/gdk2/gdk2-Graphics-Contexts.html#gdk-gc-set-clip-rectangle">gdk_gc_set_clip_rectangle</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">gc</span><span class="symbol">,</span><span class="normal"> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS">NULL</a></span><span class="symbol">);</span></pre></td>
+<span class="function">gdk_gc_set_clip_rectangle</span> <span class="gtkdoc opt">(</span>gc<span class="gtkdoc opt">,</span> NULL<span class="gtkdoc opt">);</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -570,24 +570,24 @@ Another alternative is to use pixbufs instead of surfaces with
 16
 17
 18</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="usertype">GtkStyleContext</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">context</span><span class="symbol">;</span>
-<span class="usertype">GtkStateFlags</span><span class="normal"> flags</span><span class="symbol">;</span>
-<span class="usertype">GdkRGBA</span><span class="normal"> rgba</span><span class="symbol">;</span>
-<span class="usertype">cairo_t</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">cr</span><span class="symbol">;</span>
+        <td class="listing_code"><pre class="programlisting">GtkStyleContext <span class="gtkdoc opt">*</span>context<span class="gtkdoc opt">;</span>
+GtkStateFlags flags<span class="gtkdoc opt">;</span>
+GdkRGBA rgba<span class="gtkdoc opt">;</span>
+cairo_t <span class="gtkdoc opt">*</span>cr<span class="gtkdoc opt">;</span>
 
-<span class="normal">cr </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="http://developer.gnome.org/gdk3/gdk3-Cairo-Interaction.html#gdk-cairo-create">gdk_cairo_create</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">drawable</span><span class="symbol">);</span>
+cr <span class="gtkdoc opt">=</span> <span class="function">gdk_cairo_create</span> <span class="gtkdoc opt">(</span>drawable<span class="gtkdoc opt">);</span>
 <span class="comment">/* clip */</span>
-<span class="function"><a href="http://developer.gnome.org/gdk3/gdk3-Cairo-Interaction.html#gdk-cairo-rectangle">gdk_cairo_rectangle</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">&amp;</span><span class="normal">area</span><span class="symbol">);</span>
-<span class="function">cairo_clip</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">);</span>
+<span class="function"><a href="http://developer.gnome.org/gdk3/gdk4-Cairo-Interaction.html#gdk-cairo-rectangle">gdk_cairo_rectangle</a></span> <span class="gtkdoc opt">(</span>cr<span class="gtkdoc opt">, &amp;</span>area<span class="gtkdoc opt">);</span>
+<span class="function">cairo_clip</span> <span class="gtkdoc opt">(</span>cr<span class="gtkdoc opt">);</span>
 <span class="comment">/* set the correct source color */</span>
-<span class="normal">context </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="GtkWidget.html#gtk-widget-get-style-context">gtk_widget_get_style_context</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">widget</span><span class="symbol">));</span>
-<span class="normal">state </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="GtkWidget.html#gtk-widget-get-state-flags">gtk_widget_get_state_flags</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">widget</span><span class="symbol">);</span>
-<span class="function"><a href="GtkStyleContext.html#gtk-style-context-get-color">gtk_style_context_get_color</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">context</span><span class="symbol">,</span><span class="normal"> state</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">&amp;</span><span class="normal">rgba</span><span class="symbol">);</span>
-<span class="function"><a href="http://developer.gnome.org/gdk3/gdk3-Cairo-Interaction.html#gdk-cairo-set-source-rgba">gdk_cairo_set_source_rgba</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">&amp;</span><span class="normal">rgba</span><span class="symbol">);</span>
+context <span class="gtkdoc opt">=</span> <span class="function"><a href="GtkWidget.html#gtk-widget-get-style-context">gtk_widget_get_style_context</a></span> <span class="gtkdoc opt">(</span>widget<span class="gtkdoc opt">));</span>
+state <span class="gtkdoc opt">=</span> <span class="function"><a href="GtkWidget.html#gtk-widget-get-state-flags">gtk_widget_get_state_flags</a></span> <span class="gtkdoc opt">(</span>widget<span class="gtkdoc opt">);</span>
+<span class="function"><a href="GtkStyleContext.html#gtk-style-context-get-color">gtk_style_context_get_color</a></span> <span class="gtkdoc opt">(</span>context<span class="gtkdoc opt">,</span> state<span class="gtkdoc opt">, &amp;</span>rgba<span class="gtkdoc opt">);</span>
+<span class="function"><a href="http://developer.gnome.org/gdk3/gdk4-Cairo-Interaction.html#gdk-cairo-set-source-rgba">gdk_cairo_set_source_rgba</a></span> <span class="gtkdoc opt">(</span>cr<span class="gtkdoc opt">, &amp;</span>rgba<span class="gtkdoc opt">);</span>
 <span class="comment">/* draw the text */</span>
-<span class="function">cairo_move_to</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">,</span><span class="normal"> x</span><span class="symbol">,</span><span class="normal"> y</span><span class="symbol">);</span>
-<span class="function"><a href="/home/mclasen/gnome/share/gtk-doc/html/pango/pango-Cairo-Rendering.html#pango-cairo-show-layout">pango_cairo_show_layout</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">,</span><span class="normal"> layout</span><span class="symbol">);</span>
-<span class="function">cairo_destroy</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">);</span></pre></td>
+<span class="function">cairo_move_to</span> <span class="gtkdoc opt">(</span>cr<span class="gtkdoc opt">,</span> x<span class="gtkdoc opt">,</span> y<span class="gtkdoc opt">);</span>
+<span class="function"><a href="/home/mclasen/gnome/share/gtk-doc/html/pango/pango-Cairo-Rendering.html#pango-cairo-show-layout">pango_cairo_show_layout</a></span> <span class="gtkdoc opt">(</span>cr<span class="gtkdoc opt">,</span> layout<span class="gtkdoc opt">);</span>
+<span class="function">cairo_destroy</span> <span class="gtkdoc opt">(</span>cr<span class="gtkdoc opt">);</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -596,7 +596,7 @@ Another alternative is to use pixbufs instead of surfaces with
 <p>
           Clipping using <code class="function">cairo_clip()</code> is of course not restricted to text
           rendering and can be used everywhere where GC clips were used.
-          And using <a href="http://developer.gnome.org/gdk3/gdk3-Cairo-Interaction.html#gdk-cairo-set-source-color"><code class="function">gdk_cairo_set_source_color()</code></a> with style colors should
+          And using <code class="function">gdk_cairo_set_source_color()</code> with style colors should
           be used in all the places where a style’s GC was used to achieve
           a particular color.
         </p>
@@ -606,7 +606,7 @@ Another alternative is to use pixbufs instead of surfaces with
 <div class="titlepage"><div><div><h4 class="title">
 <a name="id-1.6.3.3.8.8"></a>What should you be aware of ?</h4></div></div></div>
 <p><b>No more stippling. </b>
-          Stippling is the usage of a bi-level mask, called a <a href="http://library.gnome.org/devel/gdk2/gdk2-Bitmaps-and-Pixmaps.html#GdkBitmap"><span class="type">GdkBitmap</span></a>.
+          Stippling is the usage of a bi-level mask, called a <span class="type">GdkBitmap</span>.
           It was often used to achieve a checkerboard effect. You can use
           <code class="function">cairo_mask()</code> to achieve this effect. To get a checkerbox mask,
           you can use code like this:
@@ -635,26 +635,26 @@ Another alternative is to use pixbufs instead of surfaces with
 18
 19
 20</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="keyword">static</span><span class="normal"> cairo_pattern_t </span><span class="symbol">*</span>
-<span class="function">gtk_color_button_get_checkered</span><span class="normal"> </span><span class="symbol">(</span><span class="type">void</span><span class="symbol">)</span>
-<span class="cbracket">{</span>
-<span class="normal">    </span><span class="comment">/* need to respect pixman's stride being a multiple of 4 */</span>
-<span class="normal">    </span><span class="keyword">static</span><span class="normal"> </span><span class="type">unsigned</span><span class="normal"> </span><span class="type">char</span><span class="normal"> data</span><span class="symbol">[</span><span class="number">8</span><span class="symbol">]</span><span class="normal"> </span><span class="symbol">=</span><span class="normal"> </span><span class="cbracket">{</span><span class="normal"> </span><span class="number">0xFF</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0x00</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0x00</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0x00</span><span class="symbol">,</span>
-<span class="normal">                                     </span><span class="number">0x00</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0xFF</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0x00</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0x00</span><span class="normal"> </span><span class="cbracket">}</span><span class="symbol">;</span>
-<span class="normal">    </span><span class="usertype">cairo_surface_t</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">surface</span><span class="symbol">;</span>
-<span class="normal">    </span><span class="usertype">cairo_pattern_t</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">pattern</span><span class="symbol">;</span>
+        <td class="listing_code"><pre class="programlisting"><span class="gtkdoc kwb">static</span> cairo_pattern_t <span class="gtkdoc opt">*</span>
+<span class="function">gtk_color_button_get_checkered</span> <span class="gtkdoc opt">(</span><span class="gtkdoc kwb">void</span><span class="gtkdoc opt">)</span>
+<span class="gtkdoc opt">{</span>
+    <span class="comment">/* need to respect pixman&apos;s stride being a multiple of 4 */</span>
+    <span class="gtkdoc kwb">static unsigned char</span> data<span class="gtkdoc opt">[</span><span class="number">8</span><span class="gtkdoc opt">] = {</span> <span class="number">0xFF</span><span class="gtkdoc opt">,</span> <span class="number">0x00</span><span class="gtkdoc opt">,</span> <span class="number">0x00</span><span class="gtkdoc opt">,</span> <span class="number">0x00</span><span class="gtkdoc opt">,</span>
+                                     <span class="number">0x00</span><span class="gtkdoc opt">,</span> <span class="number">0xFF</span><span class="gtkdoc opt">,</span> <span class="number">0x00</span><span class="gtkdoc opt">,</span> <span class="number">0x00</span> <span class="gtkdoc opt">};</span>
+    cairo_surface_t <span class="gtkdoc opt">*</span>surface<span class="gtkdoc opt">;</span>
+    cairo_pattern_t <span class="gtkdoc opt">*</span>pattern<span class="gtkdoc opt">;</span>
 
-<span class="normal">    surface </span><span class="symbol">=</span><span class="normal"> </span><span class="function">cairo_image_surface_create_for_data</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">data</span><span class="symbol">,</span>
-<span class="normal">                                                   CAIRO_FORMAT_A8</span><span class="symbol">,</span>
-<span class="normal">                                                   </span><span class="number">2</span><span class="symbol">,</span><span class="normal"> </span><span class="number">2</span><span class="symbol">,</span>
-<span class="normal">                                                   </span><span class="number">4</span><span class="symbol">);</span>
-<span class="normal">    pattern </span><span class="symbol">=</span><span class="normal"> </span><span class="function">cairo_pattern_create_for_surface</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">surface</span><span class="symbol">);</span>
-<span class="normal">    </span><span class="function">cairo_surface_destroy</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">surface</span><span class="symbol">);</span>
-<span class="normal">    </span><span class="function">cairo_pattern_set_extend</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">pattern</span><span class="symbol">,</span><span class="normal"> CAIRO_EXTEND_REPEAT</span><span class="symbol">);</span>
-<span class="normal">    </span><span class="function">cairo_pattern_set_filter</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">pattern</span><span class="symbol">,</span><span class="normal"> CAIRO_FILTER_NEAREST</span><span class="symbol">);</span>
+    surface <span class="gtkdoc opt">=</span> <span class="function">cairo_image_surface_create_for_data</span> <span class="gtkdoc opt">(</span>data<span class="gtkdoc opt">,</span>
+                                                   CAIRO_FORMAT_A8<span class="gtkdoc opt">,</span>
+                                                   <span class="number">2</span><span class="gtkdoc opt">,</span> <span class="number">2</span><span class="gtkdoc opt">,</span>
+                                                   <span class="number">4</span><span class="gtkdoc opt">);</span>
+    pattern <span class="gtkdoc opt">=</span> <span class="function">cairo_pattern_create_for_surface</span> <span class="gtkdoc opt">(</span>surface<span class="gtkdoc opt">);</span>
+    <span class="function">cairo_surface_destroy</span> <span class="gtkdoc opt">(</span>surface<span class="gtkdoc opt">);</span>
+    <span class="function">cairo_pattern_set_extend</span> <span class="gtkdoc opt">(</span>pattern<span class="gtkdoc opt">,</span> CAIRO_EXTEND_REPEAT<span class="gtkdoc opt">);</span>
+    <span class="function">cairo_pattern_set_filter</span> <span class="gtkdoc opt">(</span>pattern<span class="gtkdoc opt">,</span> CAIRO_FILTER_NEAREST<span class="gtkdoc opt">);</span>
 
-<span class="normal">    </span><span class="keyword">return</span><span class="normal"> pattern</span><span class="symbol">;</span>
-<span class="cbracket">}</span></pre></td>
+    <span class="keyword">return</span> pattern<span class="gtkdoc opt">;</span>
+<span class="gtkdoc opt">}</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -667,7 +667,7 @@ Another alternative is to use pixbufs instead of surfaces with
           stippling is absent from text rendering, in particular <a class="link" href="GtkTextTag.html" title="GtkTextTag"><span class="type">GtkTextTag</span></a>.
         </p>
 <p><b>Using the target also as source or mask. </b>
-          The <a href="http://library.gnome.org/devel/gdk2/gdk2-Drawing-Primitives.html#gdk-draw-drawable"><code class="function">gdk_draw_drawable()</code></a> function allowed using the same drawable
+          The <code class="function">gdk_draw_drawable()</code> function allowed using the same drawable
           as source and target. This was often used to achieve a scrolling
           effect. Cairo does not allow this yet. You can however use
           <code class="function">cairo_push_group()</code> to get a different intermediate target that
@@ -683,12 +683,12 @@ Another alternative is to use pixbufs instead of surfaces with
 4
 5
 6</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="function"><a href="http://library.gnome.org/devel/gdk2/gdk2-Drawing-Primitives.html#gdk-draw-drawable">gdk_draw_drawable</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">pixmap</span><span class="symbol">,</span>
-<span class="normal">                   gc</span><span class="symbol">,</span>
-<span class="normal">                   pixmap</span><span class="symbol">,</span>
-<span class="normal">                   area</span><span class="symbol">.</span><span class="normal">x </span><span class="symbol">+</span><span class="normal"> dx</span><span class="symbol">,</span><span class="normal"> area</span><span class="symbol">.</span><span class="normal">y </span><span class="symbol">+</span><span class="normal"> dy</span><span class="symbol">,</span>
-<span class="normal">                   area</span><span class="symbol">.</span><span class="normal">x</span><span class="symbol">,</span><span class="normal"> area</span><span class="symbol">.</span><span class="normal">y</span><span class="symbol">,</span>
-<span class="normal">                   area</span><span class="symbol">.</span><span class="normal">width</span><span class="symbol">,</span><span class="normal"> area</span><span class="symbol">.</span><span class="normal">height</span><span class="symbol">);</span></pre></td>
+        <td class="listing_code"><pre class="programlisting"><span class="function">gdk_draw_drawable</span> <span class="gtkdoc opt">(</span>pixmap<span class="gtkdoc opt">,</span>
+                   gc<span class="gtkdoc opt">,</span>
+                   pixmap<span class="gtkdoc opt">,</span>
+                   area<span class="gtkdoc opt">.</span>x <span class="gtkdoc opt">+</span> dx<span class="gtkdoc opt">,</span> area<span class="gtkdoc opt">.</span>y <span class="gtkdoc opt">+</span> dy<span class="gtkdoc opt">,</span>
+                   area<span class="gtkdoc opt">.</span>x<span class="gtkdoc opt">,</span> area<span class="gtkdoc opt">.</span>y<span class="gtkdoc opt">,</span>
+                   area<span class="gtkdoc opt">.</span>width<span class="gtkdoc opt">,</span> area<span class="gtkdoc opt">.</span>height<span class="gtkdoc opt">);</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -714,19 +714,19 @@ Another alternative is to use pixbufs instead of surfaces with
 11
 12
 13</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="usertype">cairo_t</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">cr </span><span class="symbol">=</span><span class="normal"> </span><span class="function">cairo_create</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">surface</span><span class="symbol">);</span>
-<span class="comment">/* clipping restricts the intermediate surface's size, so it's a good idea</span>
+        <td class="listing_code"><pre class="programlisting">cairo_t <span class="gtkdoc opt">*</span>cr <span class="gtkdoc opt">=</span> <span class="function">cairo_create</span> <span class="gtkdoc opt">(</span>surface<span class="gtkdoc opt">);</span>
+<span class="comment">/* clipping restricts the intermediate surface&apos;s size, so it&apos;s a good idea</span>
 <span class="comment"> * to use it. */</span>
-<span class="function"><a href="http://developer.gnome.org/gdk3/gdk3-Cairo-Interaction.html#gdk-cairo-rectangle">gdk_cairo_rectangle</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">&amp;</span><span class="normal">area</span><span class="symbol">);</span>
-<span class="function">cairo_clip</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">);</span>
+<span class="function"><a href="http://developer.gnome.org/gdk3/gdk4-Cairo-Interaction.html#gdk-cairo-rectangle">gdk_cairo_rectangle</a></span> <span class="gtkdoc opt">(</span>cr<span class="gtkdoc opt">, &amp;</span>area<span class="gtkdoc opt">);</span>
+<span class="function">cairo_clip</span> <span class="gtkdoc opt">(</span>cr<span class="gtkdoc opt">);</span>
 <span class="comment">/* Now push a group to change the target */</span>
-<span class="function">cairo_push_group</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">);</span>
-<span class="function">cairo_set_source_surface</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">,</span><span class="normal"> surface</span><span class="symbol">,</span><span class="normal"> dx</span><span class="symbol">,</span><span class="normal"> dy</span><span class="symbol">);</span>
-<span class="function">cairo_paint</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">);</span>
+<span class="function">cairo_push_group</span> <span class="gtkdoc opt">(</span>cr<span class="gtkdoc opt">);</span>
+<span class="function">cairo_set_source_surface</span> <span class="gtkdoc opt">(</span>cr<span class="gtkdoc opt">,</span> surface<span class="gtkdoc opt">,</span> dx<span class="gtkdoc opt">,</span> dy<span class="gtkdoc opt">);</span>
+<span class="function">cairo_paint</span> <span class="gtkdoc opt">(</span>cr<span class="gtkdoc opt">);</span>
 <span class="comment">/* Now copy the intermediate target back */</span>
-<span class="function">cairo_pop_group_to_source</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">);</span>
-<span class="function">cairo_paint</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">);</span>
-<span class="function">cairo_destroy</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">);</span></pre></td>
+<span class="function">cairo_pop_group_to_source</span> <span class="gtkdoc opt">(</span>cr<span class="gtkdoc opt">);</span>
+<span class="function">cairo_paint</span> <span class="gtkdoc opt">(</span>cr<span class="gtkdoc opt">);</span>
+<span class="function">cairo_destroy</span> <span class="gtkdoc opt">(</span>cr<span class="gtkdoc opt">);</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -736,7 +736,7 @@ Another alternative is to use pixbufs instead of surfaces with
 The surface here can be either an image surface or a X surface,
 and can either be created on the spot or kept around for caching purposes.
 Another alternative is to use pixbufs instead of surfaces with
-<a href="http://developer.gnome.org/gdk3/gdk3-Cairo-Interaction.html#gdk-cairo-set-source-pixbuf"><code class="function">gdk_cairo_set_source_pixbuf()</code></a> instead of <code class="function">cairo_set_source_surface()</code>.
+<a href="http://developer.gnome.org/gdk3/gdk4-Cairo-Interaction.html#gdk-cairo-set-source-pixbuf"><code class="function">gdk_cairo_set_source_pixbuf()</code></a> instead of <code class="function">cairo_set_source_surface()</code>.
         
           The cairo developers plan to add self-copies in the future to allow
           exactly this effect, so you might want to keep up on cairo
@@ -744,12 +744,12 @@ Another alternative is to use pixbufs instead of surfaces with
         </p>
 <p><b>Using pango_cairo_show_layout() instead of gdk_draw_layout_with_colors(). </b>
           GDK provided a way to ignore the color attributes of text and use
-          a hardcoded text color with the <a href="http://library.gnome.org/devel/gdk2/gdk2-Drawing-Primitives.html#gdk-draw-layout-with-colors"><code class="function">gdk_draw_layout_with_colors()</code></a>
+          a hardcoded text color with the <code class="function">gdk_draw_layout_with_colors()</code>
           function. This is often used to draw text shadows or selections.
           Pango’s cairo support does not yet provide this functionality. If
           you use Pango layouts that change colors, the easiest way to achieve
           a similar effect is using <a href="/home/mclasen/gnome/share/gtk-doc/html/pango/pango-Cairo-Rendering.html#pango-cairo-layout-path"><code class="function">pango_cairo_layout_path()</code></a> and <code class="function">cairo_fill()</code>
-          instead of <a href="http://library.gnome.org/devel/gdk2/gdk2-Drawing-Primitives.html#gdk-draw-layout-with-colors"><code class="function">gdk_draw_layout_with_colors()</code></a>. Note that this results in
+          instead of <code class="function">gdk_draw_layout_with_colors()</code>. Note that this results in
           a slightly uglier-looking text, as subpixel anti-aliasing is not
           supported.
         </p>