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

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

@@ -23,8 +23,8 @@
 <div class="titlepage"><div><div><h2 class="title">
 <a name="id-1.3.2"></a>Object Hierarchy</h2></div></div></div>
 <pre class="screen">
-    <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct">GObject</a>
-    <span class="lineart">├──</span> <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GInitiallyUnowned">GInitiallyUnowned</a>
+    <a href="/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObject-struct">GObject</a>
+    <span class="lineart">├──</span> <a href="/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GInitiallyUnowned">GInitiallyUnowned</a>
     <span class="lineart">│</span>   <span class="lineart">├──</span> <a class="link" href="GtkWidget.html" title="GtkWidget">GtkWidget</a>
     <span class="lineart">│</span>   <span class="lineart">│</span>   <span class="lineart">├──</span> <a class="link" href="GtkContainer.html" title="GtkContainer">GtkContainer</a>
     <span class="lineart">│</span>   <span class="lineart">│</span>   <span class="lineart">│</span>   <span class="lineart">├──</span> <a class="link" href="GtkBin.html" title="GtkBin">GtkBin</a>
@@ -186,7 +186,7 @@
     <span class="lineart">│</span>   <span class="lineart">│</span>   <span class="lineart">╰──</span> <a class="link" href="GtkRadioAction.html" title="GtkRadioAction">GtkRadioAction</a>
     <span class="lineart">│</span>   <span class="lineart">╰──</span> <a class="link" href="GtkRecentAction.html" title="GtkRecentAction">GtkRecentAction</a>
     <span class="lineart">├──</span> <a class="link" href="GtkActionGroup.html" title="GtkActionGroup">GtkActionGroup</a>
-    <span class="lineart">├──</span> <a href="https://developer.gnome.org/gio/unstable/GApplication.html#GApplication-struct">GApplication</a>
+    <span class="lineart">├──</span> <a href="/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/share/gtk-doc/html/gio/GApplication.html#GApplication-struct">GApplication</a>
     <span class="lineart">│</span>   <span class="lineart">╰──</span> <a class="link" href="GtkApplication.html" title="GtkApplication">GtkApplication</a>
     <span class="lineart">├──</span> <a class="link" href="GtkBuilder.html" title="GtkBuilder">GtkBuilder</a>
     <span class="lineart">├──</span> <a class="link" href="GtkCellAreaContext.html" title="GtkCellAreaContext">GtkCellAreaContext</a>
@@ -195,24 +195,25 @@
     <span class="lineart">├──</span> <a class="link" href="GtkEntryBuffer.html" title="GtkEntryBuffer">GtkEntryBuffer</a>
     <span class="lineart">├──</span> <a class="link" href="GtkEntryCompletion.html" title="GtkEntryCompletion">GtkEntryCompletion</a>
     <span class="lineart">├──</span> <a class="link" href="GtkEventController.html" title="GtkEventController">GtkEventController</a>
-    <span class="lineart">│</span>   <span class="lineart">╰──</span> <a class="link" href="GtkGesture.html" title="GtkGesture">GtkGesture</a>
-    <span class="lineart">│</span>       <span class="lineart">├──</span> <a class="link" href="GtkGestureSingle.html" title="GtkGestureSingle">GtkGestureSingle</a>
-    <span class="lineart">│</span>       <span class="lineart">│</span>   <span class="lineart">├──</span> <a class="link" href="GtkGestureDrag.html" title="GtkGestureDrag">GtkGestureDrag</a>
-    <span class="lineart">│</span>       <span class="lineart">│</span>   <span class="lineart">│</span>   <span class="lineart">╰──</span> <a class="link" href="GtkGesturePan.html" title="GtkGesturePan">GtkGesturePan</a>
-    <span class="lineart">│</span>       <span class="lineart">│</span>   <span class="lineart">├──</span> <a class="link" href="GtkGestureLongPress.html" title="GtkGestureLongPress">GtkGestureLongPress</a>
-    <span class="lineart">│</span>       <span class="lineart">│</span>   <span class="lineart">├──</span> <a class="link" href="GtkGestureMultiPress.html" title="GtkGestureMultiPress">GtkGestureMultiPress</a>
-    <span class="lineart">│</span>       <span class="lineart">│</span>   <span class="lineart">╰──</span> <a class="link" href="GtkGestureSwipe.html" title="GtkGestureSwipe">GtkGestureSwipe</a>
-    <span class="lineart">│</span>       <span class="lineart">├──</span> <a class="link" href="GtkGestureRotate.html" title="GtkGestureRotate">GtkGestureRotate</a>
-    <span class="lineart">│</span>       <span class="lineart">╰──</span> <a class="link" href="GtkGestureZoom.html" title="GtkGestureZoom">GtkGestureZoom</a>
+    <span class="lineart">│</span>   <span class="lineart">├──</span> <a class="link" href="GtkGesture.html" title="GtkGesture">GtkGesture</a>
+    <span class="lineart">│</span>   <span class="lineart">│</span>   <span class="lineart">├──</span> <a class="link" href="GtkGestureSingle.html" title="GtkGestureSingle">GtkGestureSingle</a>
+    <span class="lineart">│</span>   <span class="lineart">│</span>   <span class="lineart">│</span>   <span class="lineart">├──</span> <a class="link" href="GtkGestureDrag.html" title="GtkGestureDrag">GtkGestureDrag</a>
+    <span class="lineart">│</span>   <span class="lineart">│</span>   <span class="lineart">│</span>   <span class="lineart">│</span>   <span class="lineart">╰──</span> <a class="link" href="GtkGesturePan.html" title="GtkGesturePan">GtkGesturePan</a>
+    <span class="lineart">│</span>   <span class="lineart">│</span>   <span class="lineart">│</span>   <span class="lineart">├──</span> <a class="link" href="GtkGestureLongPress.html" title="GtkGestureLongPress">GtkGestureLongPress</a>
+    <span class="lineart">│</span>   <span class="lineart">│</span>   <span class="lineart">│</span>   <span class="lineart">├──</span> <a class="link" href="GtkGestureMultiPress.html" title="GtkGestureMultiPress">GtkGestureMultiPress</a>
+    <span class="lineart">│</span>   <span class="lineart">│</span>   <span class="lineart">│</span>   <span class="lineart">╰──</span> <a class="link" href="GtkGestureSwipe.html" title="GtkGestureSwipe">GtkGestureSwipe</a>
+    <span class="lineart">│</span>   <span class="lineart">│</span>   <span class="lineart">├──</span> <a class="link" href="GtkGestureRotate.html" title="GtkGestureRotate">GtkGestureRotate</a>
+    <span class="lineart">│</span>   <span class="lineart">│</span>   <span class="lineart">╰──</span> <a class="link" href="GtkGestureZoom.html" title="GtkGestureZoom">GtkGestureZoom</a>
+    <span class="lineart">│</span>   <span class="lineart">╰──</span> <a class="link" href="GtkPadController.html" title="GtkPadController">GtkPadController</a>
     <span class="lineart">├──</span> <a class="link" href="gtk3-Themeable-Stock-Images.html#GtkIconFactory">GtkIconFactory</a>
     <span class="lineart">├──</span> <a class="link" href="GtkIconTheme.html" title="GtkIconTheme">GtkIconTheme</a>
     <span class="lineart">├──</span> <a class="link" href="GtkIMContext.html" title="GtkIMContext">GtkIMContext</a>
     <span class="lineart">│</span>   <span class="lineart">├──</span> <a class="link" href="GtkIMContextSimple.html" title="GtkIMContextSimple">GtkIMContextSimple</a>
     <span class="lineart">│</span>   <span class="lineart">╰──</span> <a class="link" href="GtkIMMulticontext.html" title="GtkIMMulticontext">GtkIMMulticontext</a>
     <span class="lineart">├──</span> <a class="link" href="GtkListStore.html" title="GtkListStore">GtkListStore</a>
-    <span class="lineart">├──</span> <a href="https://developer.gnome.org/gio/unstable/GMountOperation.html#GMountOperation-struct">GMountOperation</a>
+    <span class="lineart">├──</span> <a href="/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/share/gtk-doc/html/gio/GMountOperation.html#GMountOperation-struct">GMountOperation</a>
     <span class="lineart">│</span>   <span class="lineart">╰──</span> <a class="link" href="gtk3-Filesystem-utilities.html#GtkMountOperation">GtkMountOperation</a>
-    <span class="lineart">├──</span> <a href="https://developer.gnome.org/gio/unstable/GEmblemedIcon.html#GEmblemedIcon-struct">GEmblemedIcon</a>
+    <span class="lineart">├──</span> <a href="/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/share/gtk-doc/html/gio/GEmblemedIcon.html#GEmblemedIcon-struct">GEmblemedIcon</a>
     <span class="lineart">│</span>   <span class="lineart">╰──</span> <a class="link" href="GtkNumerableIcon.html" title="GtkNumerableIcon">GtkNumerableIcon</a>
     <span class="lineart">├──</span> <a class="link" href="GtkPageSetup.html" title="GtkPageSetup">GtkPageSetup</a>
     <span class="lineart">├──</span> <a class="link" href="GtkPrinter.html" title="GtkPrinter">GtkPrinter</a>
@@ -241,7 +242,7 @@
     <span class="lineart">├──</span> <a class="link" href="GtkWindowGroup.html" title="GtkWindowGroup">GtkWindowGroup</a>
     <span class="lineart">├──</span> <a class="link" href="GtkTooltip.html" title="GtkTooltip">GtkTooltip</a>
     <span class="lineart">╰──</span> <a class="link" href="GtkPrinter.html#GtkPrintBackend">GtkPrintBackend</a>
-    <a href="https://developer.gnome.org/gobject/unstable/GTypeModule.html">GInterface</a>
+    <a href="/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/share/gtk-doc/html/gobject/GTypeModule.html">GInterface</a>
     <span class="lineart">├──</span> <a class="link" href="GtkBuildable.html" title="GtkBuildable">GtkBuildable</a>
     <span class="lineart">├──</span> <a class="link" href="GtkActionable.html" title="GtkActionable">GtkActionable</a>
     <span class="lineart">├──</span> <a class="link" href="GtkActivatable.html" title="GtkActivatable">GtkActivatable</a>
@@ -262,7 +263,7 @@
     <span class="lineart">├──</span> <a class="link" href="gtk3-High-level-Printing-API.html#GtkPrintOperationPreview">GtkPrintOperationPreview</a>
     <span class="lineart">├──</span> <a class="link" href="GtkRecentChooser.html" title="GtkRecentChooser">GtkRecentChooser</a>
     <span class="lineart">╰──</span> <a class="link" href="GtkToolShell.html" title="GtkToolShell">GtkToolShell</a>
-    <a href="https://developer.gnome.org/gobject/unstable/gobject-Boxed-Types.html">GBoxed</a>
+    <a href="/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/share/gtk-doc/html/gobject/gobject-Boxed-Types.html">GBoxed</a>
     <span class="lineart">├──</span> <a class="link" href="GtkPaperSize.html" title="GtkPaperSize">GtkPaperSize</a>
     <span class="lineart">├──</span> <a class="link" href="GtkTextIter.html" title="GtkTextIter">GtkTextIter</a>
     <span class="lineart">├──</span> <a class="link" href="gtk3-Selections.html#GtkSelectionData">GtkSelectionData</a>

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

@@ -63,17 +63,17 @@
 9
 10
 11</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_class_init</span><span class="normal"> </span><span class="symbol">(</span><span class="usertype">MyWidgetClass</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">class</span><span class="symbol">)</span>
-<span class="cbracket">{</span>
-<span class="normal">  </span><span class="usertype">GtkWidgetClass</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">widget_class </span><span class="symbol">=</span><span class="normal"> </span><span class="function">GTK_WIDGET_CLASS</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">class</span><span class="symbol">);</span>
+        <td class="listing_code"><pre class="programlisting"><span class="gtkdoc kwb">static void</span>
+<span class="function">my_widget_class_init</span> <span class="gtkdoc opt">(</span>MyWidgetClass <span class="gtkdoc opt">*</span><span class="gtkdoc kwc">class</span><span class="gtkdoc opt">)</span>
+<span class="gtkdoc opt">{</span>
+  GtkWidgetClass <span class="gtkdoc opt">*</span>widget_class <span class="gtkdoc opt">=</span> <span class="function">GTK_WIDGET_CLASS</span> <span class="gtkdoc opt">(</span><span class="gtkdoc kwc">class</span><span class="gtkdoc opt">);</span>
 
-<span class="normal">  </span><span class="comment">/* ... */</span>
+  <span class="comment">/* ... */</span>
 
-<span class="normal">  widget_class</span><span class="symbol">-&gt;</span><span class="normal">size_request </span><span class="symbol">=</span><span class="normal"> my_widget_size_request</span><span class="symbol">;</span>
+  widget_class<span class="gtkdoc opt">-&gt;</span>size_request <span class="gtkdoc opt">=</span> my_widget_size_request<span class="gtkdoc opt">;</span>
 
-<span class="normal">  </span><span class="comment">/* ... */</span>
-<span class="cbracket">}</span></pre></td>
+  <span class="comment">/* ... */</span>
+<span class="gtkdoc opt">}</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -129,45 +129,45 @@
 37
 38
 39</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_get_preferred_width</span><span class="normal"> </span><span class="symbol">(</span><span class="usertype">GtkWidget</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">widget</span><span class="symbol">,</span>
-<span class="normal">                               </span><span class="usertype">gint</span><span class="normal">      </span><span class="symbol">*</span><span class="normal">minimal_width</span><span class="symbol">,</span>
-<span class="normal">                               </span><span class="usertype">gint</span><span class="normal">      </span><span class="symbol">*</span><span class="normal">natural_width</span><span class="symbol">)</span>
-<span class="cbracket">{</span>
-<span class="normal">  </span><span class="usertype">GtkRequisition</span><span class="normal"> requisition</span><span class="symbol">;</span>
+        <td class="listing_code"><pre class="programlisting"><span class="gtkdoc kwb">static void</span>
+<span class="function">my_widget_get_preferred_width</span> <span class="gtkdoc opt">(</span>GtkWidget <span class="gtkdoc opt">*</span>widget<span class="gtkdoc opt">,</span>
+                               gint      <span class="gtkdoc opt">*</span>minimal_width<span class="gtkdoc opt">,</span>
+                               gint      <span class="gtkdoc opt">*</span>natural_width<span class="gtkdoc opt">)</span>
+<span class="gtkdoc opt">{</span>
+  GtkRequisition requisition<span class="gtkdoc opt">;</span>
 
-<span class="normal">  </span><span class="function">my_widget_size_request</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">widget</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">&amp;</span><span class="normal">requisition</span><span class="symbol">);</span>
+  <span class="function">my_widget_size_request</span> <span class="gtkdoc opt">(</span>widget<span class="gtkdoc opt">, &amp;</span>requisition<span class="gtkdoc opt">);</span>
 
-<span class="normal">  </span><span class="symbol">*</span><span class="normal">minimal_width </span><span class="symbol">=</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">natural_width </span><span class="symbol">=</span><span class="normal"> requisition</span><span class="symbol">.</span><span class="normal">width</span><span class="symbol">;</span>
-<span class="cbracket">}</span>
+  <span class="gtkdoc opt">*</span>minimal_width <span class="gtkdoc opt">= *</span>natural_width <span class="gtkdoc opt">=</span> requisition<span class="gtkdoc opt">.</span>width<span class="gtkdoc opt">;</span>
+<span class="gtkdoc opt">}</span>
 
-<span class="keyword">static</span><span class="normal"> </span><span class="type">void</span>
-<span class="function">my_widget_get_preferred_height</span><span class="normal"> </span><span class="symbol">(</span><span class="usertype">GtkWidget</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">widget</span><span class="symbol">,</span>
-<span class="normal">                                </span><span class="usertype">gint</span><span class="normal">      </span><span class="symbol">*</span><span class="normal">minimal_height</span><span class="symbol">,</span>
-<span class="normal">                                </span><span class="usertype">gint</span><span class="normal">      </span><span class="symbol">*</span><span class="normal">natural_height</span><span class="symbol">)</span>
-<span class="cbracket">{</span>
-<span class="normal">  </span><span class="usertype">GtkRequisition</span><span class="normal"> requisition</span><span class="symbol">;</span>
+<span class="gtkdoc kwb">static void</span>
+<span class="function">my_widget_get_preferred_height</span> <span class="gtkdoc opt">(</span>GtkWidget <span class="gtkdoc opt">*</span>widget<span class="gtkdoc opt">,</span>
+                                gint      <span class="gtkdoc opt">*</span>minimal_height<span class="gtkdoc opt">,</span>
+                                gint      <span class="gtkdoc opt">*</span>natural_height<span class="gtkdoc opt">)</span>
+<span class="gtkdoc opt">{</span>
+  GtkRequisition requisition<span class="gtkdoc opt">;</span>
 
-<span class="normal">  </span><span class="function">my_widget_size_request</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">widget</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">&amp;</span><span class="normal">requisition</span><span class="symbol">);</span>
+  <span class="function">my_widget_size_request</span> <span class="gtkdoc opt">(</span>widget<span class="gtkdoc opt">, &amp;</span>requisition<span class="gtkdoc opt">);</span>
 
-<span class="normal">  </span><span class="symbol">*</span><span class="normal">minimal_height </span><span class="symbol">=</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">natural_height </span><span class="symbol">=</span><span class="normal"> requisition</span><span class="symbol">.</span><span class="normal">height</span><span class="symbol">;</span>
-<span class="cbracket">}</span>
+  <span class="gtkdoc opt">*</span>minimal_height <span class="gtkdoc opt">= *</span>natural_height <span class="gtkdoc opt">=</span> requisition<span class="gtkdoc opt">.</span>height<span class="gtkdoc opt">;</span>
+<span class="gtkdoc opt">}</span>
 
-<span class="normal"> </span><span class="comment">/* ... */</span>
+ <span class="comment">/* ... */</span>
 
-<span class="keyword">static</span><span class="normal"> </span><span class="type">void</span>
-<span class="function">my_widget_class_init</span><span class="normal"> </span><span class="symbol">(</span><span class="usertype">MyWidgetClass</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">class</span><span class="symbol">)</span>
-<span class="cbracket">{</span>
-<span class="normal">  </span><span class="usertype">GtkWidgetClass</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">widget_class </span><span class="symbol">=</span><span class="normal"> </span><span class="function">GTK_WIDGET_CLASS</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">class</span><span class="symbol">);</span>
+<span class="gtkdoc kwb">static void</span>
+<span class="function">my_widget_class_init</span> <span class="gtkdoc opt">(</span>MyWidgetClass <span class="gtkdoc opt">*</span><span class="gtkdoc kwc">class</span><span class="gtkdoc opt">)</span>
+<span class="gtkdoc opt">{</span>
+  GtkWidgetClass <span class="gtkdoc opt">*</span>widget_class <span class="gtkdoc opt">=</span> <span class="function">GTK_WIDGET_CLASS</span> <span class="gtkdoc opt">(</span><span class="gtkdoc kwc">class</span><span class="gtkdoc opt">);</span>
 
-<span class="normal">  </span><span class="comment">/* ... */</span>
+  <span class="comment">/* ... */</span>
 
-<span class="normal">  widget_class</span><span class="symbol">-&gt;</span><span class="normal">get_preferred_width </span><span class="symbol">=</span><span class="normal"> my_widget_get_preferred_width</span><span class="symbol">;</span>
-<span class="normal">  widget_class</span><span class="symbol">-&gt;</span><span class="normal">get_preferred_height </span><span class="symbol">=</span><span class="normal"> my_widget_get_preferred_height</span><span class="symbol">;</span>
+  widget_class<span class="gtkdoc opt">-&gt;</span>get_preferred_width <span class="gtkdoc opt">=</span> my_widget_get_preferred_width<span class="gtkdoc opt">;</span>
+  widget_class<span class="gtkdoc opt">-&gt;</span>get_preferred_height <span class="gtkdoc opt">=</span> my_widget_get_preferred_height<span class="gtkdoc opt">;</span>
 
-<span class="normal">  </span><span class="comment">/* ... */</span>
+  <span class="comment">/* ... */</span>
 
-<span class="cbracket">}</span></pre></td>
+<span class="gtkdoc opt">}</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -232,52 +232,52 @@
 44
 45
 46</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_get_preferred_size</span><span class="normal"> </span><span class="symbol">(</span><span class="usertype">GtkWidget</span><span class="normal">      </span><span class="symbol">*</span><span class="normal">widget</span><span class="symbol">,</span>
-<span class="normal">                              </span><span class="usertype">GtkOrientation</span><span class="normal">  orientation</span><span class="symbol">,</span>
-<span class="normal">                               </span><span class="usertype">gint</span><span class="normal">          </span><span class="symbol">*</span><span class="normal">minimal_size</span><span class="symbol">,</span>
-<span class="normal">                               </span><span class="usertype">gint</span><span class="normal">          </span><span class="symbol">*</span><span class="normal">natural_size</span><span class="symbol">)</span>
-<span class="cbracket">{</span>
-
-<span class="normal">  </span><span class="comment">/* do things that are common for both orientations ... */</span>
-
-<span class="normal">  </span><span class="keyword">if</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">orientation </span><span class="symbol">==</span><span class="normal"> <a href="gtk3-Standard-Enumerations.html#GTK-ORIENTATION-HORIZONTAL:CAPS">GTK_ORIENTATION_HORIZONTAL</a></span><span class="symbol">)</span>
-<span class="normal">    </span><span class="cbracket">{</span>
-<span class="normal">      </span><span class="comment">/* do stuff that only applies to width... */</span>
-
-<span class="normal">      </span><span class="symbol">*</span><span class="normal">minimal_size </span><span class="symbol">=</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">natural_size </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="keyword">else</span>
-<span class="normal">   </span><span class="cbracket">{</span>
-<span class="normal">      </span><span class="comment">/* do stuff that only applies to height... */</span>
-
-<span class="normal">      </span><span class="symbol">*</span><span class="normal">minimal_size </span><span class="symbol">=</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">natural_size </span><span class="symbol">=</span><span class="normal"> </span><span class="symbol">...</span>
-<span class="normal">   </span><span class="cbracket">}</span>
-<span class="cbracket">}</span>
-
-<span class="keyword">static</span><span class="normal"> </span><span class="type">void</span>
-<span class="function">my_widget_get_preferred_width</span><span class="normal"> </span><span class="symbol">(</span><span class="usertype">GtkWidget</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">widget</span><span class="symbol">,</span>
-<span class="normal">                               </span><span class="usertype">gint</span><span class="normal">      </span><span class="symbol">*</span><span class="normal">minimal_width</span><span class="symbol">,</span>
-<span class="normal">                               </span><span class="usertype">gint</span><span class="normal">      </span><span class="symbol">*</span><span class="normal">natural_width</span><span class="symbol">)</span>
-<span class="cbracket">{</span>
-<span class="normal">  </span><span class="function">my_widget_get_preferred_size</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">widget</span><span class="symbol">,</span>
-<span class="normal">                                <a href="gtk3-Standard-Enumerations.html#GTK-ORIENTATION-HORIZONTAL:CAPS">GTK_ORIENTATION_HORIZONTAL</a></span><span class="symbol">,</span>
-<span class="normal">                                minimal_width</span><span class="symbol">,</span>
-<span class="normal">                                natural_width</span><span class="symbol">);</span>
-<span class="cbracket">}</span>
-
-<span class="keyword">static</span><span class="normal"> </span><span class="type">void</span>
-<span class="function">my_widget_get_preferred_height</span><span class="normal"> </span><span class="symbol">(</span><span class="usertype">GtkWidget</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">widget</span><span class="symbol">,</span>
-<span class="normal">                                </span><span class="usertype">gint</span><span class="normal">      </span><span class="symbol">*</span><span class="normal">minimal_height</span><span class="symbol">,</span>
-<span class="normal">                                </span><span class="usertype">gint</span><span class="normal">      </span><span class="symbol">*</span><span class="normal">natural_height</span><span class="symbol">)</span>
-<span class="cbracket">{</span>
-<span class="normal">  </span><span class="function">my_widget_get_preferred_size</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">widget</span><span class="symbol">,</span>
-<span class="normal">                                <a href="gtk3-Standard-Enumerations.html#GTK-ORIENTATION-VERTICAL:CAPS">GTK_ORIENTATION_VERTICAL</a></span><span class="symbol">,</span>
-<span class="normal">                                minimal_height</span><span class="symbol">,</span>
-<span class="normal">                                natural_height</span><span class="symbol">);</span>
-<span class="cbracket">}</span>
-
-<span class="normal"> </span><span class="comment">/* ... */</span></pre></td>
+        <td class="listing_code"><pre class="programlisting"><span class="gtkdoc kwb">static void</span>
+<span class="function">my_widget_get_preferred_size</span> <span class="gtkdoc opt">(</span>GtkWidget      <span class="gtkdoc opt">*</span>widget<span class="gtkdoc opt">,</span>
+                              GtkOrientation  orientation<span class="gtkdoc opt">,</span>
+                               gint          <span class="gtkdoc opt">*</span>minimal_size<span class="gtkdoc opt">,</span>
+                               gint          <span class="gtkdoc opt">*</span>natural_size<span class="gtkdoc opt">)</span>
+<span class="gtkdoc opt">{</span>
+
+  <span class="comment">/* do things that are common for both orientations ... */</span>
+
+  <span class="keyword">if</span> <span class="gtkdoc opt">(</span>orientation <span class="gtkdoc opt">==</span> GTK_ORIENTATION_HORIZONTAL<span class="gtkdoc opt">)</span>
+    <span class="gtkdoc opt">{</span>
+      <span class="comment">/* do stuff that only applies to width... */</span>
+
+      <span class="gtkdoc opt">*</span>minimal_size <span class="gtkdoc opt">= *</span>natural_size <span class="gtkdoc opt">= ...</span>
+    <span class="gtkdoc opt">}</span>
+  <span class="keyword">else</span>
+   <span class="gtkdoc opt">{</span>
+      <span class="comment">/* do stuff that only applies to height... */</span>
+
+      <span class="gtkdoc opt">*</span>minimal_size <span class="gtkdoc opt">= *</span>natural_size <span class="gtkdoc opt">= ...</span>
+   <span class="gtkdoc opt">}</span>
+<span class="gtkdoc opt">}</span>
+
+<span class="gtkdoc kwb">static void</span>
+<span class="function">my_widget_get_preferred_width</span> <span class="gtkdoc opt">(</span>GtkWidget <span class="gtkdoc opt">*</span>widget<span class="gtkdoc opt">,</span>
+                               gint      <span class="gtkdoc opt">*</span>minimal_width<span class="gtkdoc opt">,</span>
+                               gint      <span class="gtkdoc opt">*</span>natural_width<span class="gtkdoc opt">)</span>
+<span class="gtkdoc opt">{</span>
+  <span class="function">my_widget_get_preferred_size</span> <span class="gtkdoc opt">(</span>widget<span class="gtkdoc opt">,</span>
+                                GTK_ORIENTATION_HORIZONTAL<span class="gtkdoc opt">,</span>
+                                minimal_width<span class="gtkdoc opt">,</span>
+                                natural_width<span class="gtkdoc opt">);</span>
+<span class="gtkdoc opt">}</span>
+
+<span class="gtkdoc kwb">static void</span>
+<span class="function">my_widget_get_preferred_height</span> <span class="gtkdoc opt">(</span>GtkWidget <span class="gtkdoc opt">*</span>widget<span class="gtkdoc opt">,</span>
+                                gint      <span class="gtkdoc opt">*</span>minimal_height<span class="gtkdoc opt">,</span>
+                                gint      <span class="gtkdoc opt">*</span>natural_height<span class="gtkdoc opt">)</span>
+<span class="gtkdoc opt">{</span>
+  <span class="function">my_widget_get_preferred_size</span> <span class="gtkdoc opt">(</span>widget<span class="gtkdoc opt">,</span>
+                                GTK_ORIENTATION_VERTICAL<span class="gtkdoc opt">,</span>
+                                minimal_height<span class="gtkdoc opt">,</span>
+                                natural_height<span class="gtkdoc opt">);</span>
+<span class="gtkdoc opt">}</span>
+
+ <span class="comment">/* ... */</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -333,33 +333,33 @@
 25
 26
 27</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">gtk_fixed_get_preferred_height</span><span class="normal"> </span><span class="symbol">(</span><span class="usertype">GtkWidget</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">widget</span><span class="symbol">,</span>
-<span class="normal">                                </span><span class="usertype">gint</span><span class="normal">      </span><span class="symbol">*</span><span class="normal">minimum</span><span class="symbol">,</span>
-<span class="normal">                                </span><span class="usertype">gint</span><span class="normal">      </span><span class="symbol">*</span><span class="normal">natural</span><span class="symbol">)</span>
-<span class="cbracket">{</span>
-<span class="normal">  </span><span class="usertype">GtkFixed</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">fixed </span><span class="symbol">=</span><span class="normal"> </span><span class="function">GTK_FIXED</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">widget</span><span class="symbol">);</span>
-<span class="normal">  </span><span class="usertype">GtkFixedPrivate</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">priv </span><span class="symbol">=</span><span class="normal"> fixed</span><span class="symbol">-&gt;</span><span class="normal">priv</span><span class="symbol">;</span>
-<span class="normal">  </span><span class="usertype">GtkFixedChild</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">child</span><span class="symbol">;</span>
-<span class="normal">  </span><span class="usertype">GList</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">children</span><span class="symbol">;</span>
-<span class="normal">  </span><span class="usertype">gint</span><span class="normal"> child_min</span><span class="symbol">,</span><span class="normal"> child_nat</span><span class="symbol">;</span>
-
-<span class="normal">  </span><span class="symbol">*</span><span class="normal">minimum </span><span class="symbol">=</span><span class="normal"> </span><span class="number">0</span><span class="symbol">;</span>
-<span class="normal">  </span><span class="symbol">*</span><span class="normal">natural </span><span class="symbol">=</span><span class="normal"> </span><span class="number">0</span><span class="symbol">;</span>
-
-<span class="normal">  </span><span class="keyword">for</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">children </span><span class="symbol">=</span><span class="normal"> priv</span><span class="symbol">-&gt;</span><span class="normal">children</span><span class="symbol">;</span><span class="normal"> children</span><span class="symbol">;</span><span class="normal"> children </span><span class="symbol">=</span><span class="normal"> children</span><span class="symbol">-&gt;</span><span class="normal">next</span><span class="symbol">)</span>
-<span class="normal">    </span><span class="cbracket">{</span>
-<span class="normal">      child </span><span class="symbol">=</span><span class="normal"> children</span><span class="symbol">-&gt;</span><span class="normal">data</span><span class="symbol">;</span>
-
-<span class="normal">      </span><span class="keyword">if</span><span class="normal"> </span><span class="symbol">(!</span><span class="function"><a href="GtkWidget.html#gtk-widget-get-visible">gtk_widget_get_visible</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">child</span><span class="symbol">-&gt;</span><span class="normal">widget</span><span class="symbol">))</span>
-<span class="normal">        </span><span class="keyword">continue</span><span class="symbol">;</span>
-
-<span class="normal">      </span><span class="function"><a href="GtkWidget.html#gtk-widget-get-preferred-height">gtk_widget_get_preferred_height</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">child</span><span class="symbol">-&gt;</span><span class="normal">widget</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">&amp;</span><span class="normal">child_min</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">&amp;</span><span class="normal">child_nat</span><span class="symbol">);</span>
-
-<span class="normal">      </span><span class="symbol">*</span><span class="normal">minimum </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#MAX:CAPS">MAX</a></span><span class="normal"> </span><span class="symbol">(*</span><span class="normal">minimum</span><span class="symbol">,</span><span class="normal"> child</span><span class="symbol">-&gt;</span><span class="normal">y </span><span class="symbol">+</span><span class="normal"> child_min</span><span class="symbol">);</span>
-<span class="normal">      </span><span class="symbol">*</span><span class="normal">natural </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#MAX:CAPS">MAX</a></span><span class="normal"> </span><span class="symbol">(*</span><span class="normal">natural</span><span class="symbol">,</span><span class="normal"> child</span><span class="symbol">-&gt;</span><span class="normal">y </span><span class="symbol">+</span><span class="normal"> child_nat</span><span class="symbol">);</span>
-<span class="normal">    </span><span class="cbracket">}</span>
-<span class="cbracket">}</span></pre></td>
+        <td class="listing_code"><pre class="programlisting"><span class="gtkdoc kwb">static void</span>
+<span class="function">gtk_fixed_get_preferred_height</span> <span class="gtkdoc opt">(</span>GtkWidget <span class="gtkdoc opt">*</span>widget<span class="gtkdoc opt">,</span>
+                                gint      <span class="gtkdoc opt">*</span>minimum<span class="gtkdoc opt">,</span>
+                                gint      <span class="gtkdoc opt">*</span>natural<span class="gtkdoc opt">)</span>
+<span class="gtkdoc opt">{</span>
+  GtkFixed <span class="gtkdoc opt">*</span>fixed <span class="gtkdoc opt">=</span> <span class="function">GTK_FIXED</span> <span class="gtkdoc opt">(</span>widget<span class="gtkdoc opt">);</span>
+  GtkFixedPrivate <span class="gtkdoc opt">*</span>priv <span class="gtkdoc opt">=</span> fixed<span class="gtkdoc opt">-&gt;</span>priv<span class="gtkdoc opt">;</span>
+  GtkFixedChild <span class="gtkdoc opt">*</span>child<span class="gtkdoc opt">;</span>
+  GList <span class="gtkdoc opt">*</span>children<span class="gtkdoc opt">;</span>
+  gint child_min<span class="gtkdoc opt">,</span> child_nat<span class="gtkdoc opt">;</span>
+
+  <span class="gtkdoc opt">*</span>minimum <span class="gtkdoc opt">=</span> <span class="number">0</span><span class="gtkdoc opt">;</span>
+  <span class="gtkdoc opt">*</span>natural <span class="gtkdoc opt">=</span> <span class="number">0</span><span class="gtkdoc opt">;</span>
+
+  <span class="keyword">for</span> <span class="gtkdoc opt">(</span>children <span class="gtkdoc opt">=</span> priv<span class="gtkdoc opt">-&gt;</span>children<span class="gtkdoc opt">;</span> children<span class="gtkdoc opt">;</span> children <span class="gtkdoc opt">=</span> children<span class="gtkdoc opt">-&gt;</span>next<span class="gtkdoc opt">)</span>
+    <span class="gtkdoc opt">{</span>
+      child <span class="gtkdoc opt">=</span> children<span class="gtkdoc opt">-&gt;</span>data<span class="gtkdoc opt">;</span>
+
+      <span class="keyword">if</span> <span class="gtkdoc opt">(!</span><span class="function"><a href="GtkWidget.html#gtk-widget-get-visible">gtk_widget_get_visible</a></span> <span class="gtkdoc opt">(</span>child<span class="gtkdoc opt">-&gt;</span>widget<span class="gtkdoc opt">))</span>
+        <span class="keyword">continue</span><span class="gtkdoc opt">;</span>
+
+      <span class="function"><a href="GtkWidget.html#gtk-widget-get-preferred-height">gtk_widget_get_preferred_height</a></span> <span class="gtkdoc opt">(</span>child<span class="gtkdoc opt">-&gt;</span>widget<span class="gtkdoc opt">, &amp;</span>child_min<span class="gtkdoc opt">, &amp;</span>child_nat<span class="gtkdoc opt">);</span>
+
+      <span class="gtkdoc opt">*</span>minimum <span class="gtkdoc opt">=</span> <span class="function"><a href="/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/share/gtk-doc/html/glib/glib-Standard-Macros.html#MAX:CAPS">MAX</a></span> <span class="gtkdoc opt">(*</span>minimum<span class="gtkdoc opt">,</span> child<span class="gtkdoc opt">-&gt;</span>y <span class="gtkdoc opt">+</span> child_min<span class="gtkdoc opt">);</span>
+      <span class="gtkdoc opt">*</span>natural <span class="gtkdoc opt">=</span> <span class="function"><a href="/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/share/gtk-doc/html/glib/glib-Standard-Macros.html#MAX:CAPS">MAX</a></span> <span class="gtkdoc opt">(*</span>natural<span class="gtkdoc opt">,</span> child<span class="gtkdoc opt">-&gt;</span>y <span class="gtkdoc opt">+</span> child_nat<span class="gtkdoc opt">);</span>
+    <span class="gtkdoc opt">}</span>
+<span class="gtkdoc opt">}</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -414,94 +414,94 @@
 </tr></thead>
 <tbody>
 <tr>
-<td><a href="http://library.gnome.org/devel/gdk2/gdk2-Points-Rectangles-and-Regions.html#GdkRegion"><span class="type">GdkRegion</span></a></td>
+<td><span class="type">GdkRegion</span></td>
 <td><span class="type">cairo_region_t</span></td>
 </tr>
 <tr>
-<td><a href="http://developer.gnome.org/gdk3/gdk3-Points-Rectangles-and-Regions.html#GdkRectangle"><span class="type">GdkRectangle</span></a></td>
+<td><a href="http://developer.gnome.org/gdk3/gdk4-Points-Rectangles-and-Regions.html#GdkRectangle"><span class="type">GdkRectangle</span></a></td>
 <td><span class="type">cairo_rectangle_int_t</span></td>
 </tr>
 <tr>
-<td><a href="http://developer.gnome.org/gdk3/gdk3-Points-Rectangles-and-Regions.html#gdk-rectangle-intersect"><code class="function">gdk_rectangle_intersect()</code></a></td>
+<td><a href="http://developer.gnome.org/gdk3/gdk4-Points-Rectangles-and-Regions.html#gdk-rectangle-intersect"><code class="function">gdk_rectangle_intersect()</code></a></td>
 <td>this function is still there</td>
 </tr>
 <tr>
-<td><a href="http://developer.gnome.org/gdk3/gdk3-Points-Rectangles-and-Regions.html#gdk-rectangle-union"><code class="function">gdk_rectangle_union()</code></a></td>
+<td><a href="http://developer.gnome.org/gdk3/gdk4-Points-Rectangles-and-Regions.html#gdk-rectangle-union"><code class="function">gdk_rectangle_union()</code></a></td>
 <td>this function is still there</td>
 </tr>
 <tr>
-<td><a href="http://library.gnome.org/devel/gdk2/gdk2-Points-Rectangles-and-Regions.html#gdk-region-new"><code class="function">gdk_region_new()</code></a></td>
+<td><code class="function">gdk_region_new()</code></td>
 <td><code class="function">cairo_region_create()</code></td>
 </tr>
 <tr>
-<td><a href="http://library.gnome.org/devel/gdk2/gdk2-Points-Rectangles-and-Regions.html#gdk-region-copy"><code class="function">gdk_region_copy()</code></a></td>
+<td><code class="function">gdk_region_copy()</code></td>
 <td><code class="function">cairo_region_copy()</code></td>
 </tr>
 <tr>
-<td><a href="http://library.gnome.org/devel/gdk2/gdk2-Points-Rectangles-and-Regions.html#gdk-region-destroy"><code class="function">gdk_region_destroy()</code></a></td>
+<td><code class="function">gdk_region_destroy()</code></td>
 <td><code class="function">cairo_region_destroy()</code></td>
 </tr>
 <tr>
-<td><a href="http://library.gnome.org/devel/gdk2/gdk2-Points-Rectangles-and-Regions.html#gdk-region-rectangle"><code class="function">gdk_region_rectangle()</code></a></td>
+<td><code class="function">gdk_region_rectangle()</code></td>
 <td><code class="function">cairo_region_create_rectangle()</code></td>
 </tr>
 <tr>
-<td><a href="http://library.gnome.org/devel/gdk2/gdk2-Points-Rectangles-and-Regions.html#gdk-region-get-clipbox"><code class="function">gdk_region_get_clipbox()</code></a></td>
+<td><code class="function">gdk_region_get_clipbox()</code></td>
 <td><code class="function">cairo_region_get_extents()</code></td>
 </tr>
 <tr>
-<td><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></td>
+<td><code class="function">gdk_region_get_rectangles()</code></td>
 <td>
 <code class="function">cairo_region_num_rectangles()</code> and
                                 <code class="function">cairo_region_get_rectangle()</code>
 </td>
 </tr>
 <tr>
-<td><a href="http://library.gnome.org/devel/gdk2/gdk2-Points-Rectangles-and-Regions.html#gdk-region-empty"><code class="function">gdk_region_empty()</code></a></td>
+<td><code class="function">gdk_region_empty()</code></td>
 <td><code class="function">cairo_region_is_empty()</code></td>
 </tr>
 <tr>
-<td><a href="http://library.gnome.org/devel/gdk2/gdk2-Points-Rectangles-and-Regions.html#gdk-region-equal"><code class="function">gdk_region_equal()</code></a></td>
+<td><code class="function">gdk_region_equal()</code></td>
 <td><code class="function">cairo_region_equal()</code></td>
 </tr>
 <tr>
-<td><a href="http://library.gnome.org/devel/gdk2/gdk2-Points-Rectangles-and-Regions.html#gdk-region-point-in"><code class="function">gdk_region_point_in()</code></a></td>
+<td><code class="function">gdk_region_point_in()</code></td>
 <td><code class="function">cairo_region_contains_point()</code></td>
 </tr>
 <tr>
-<td><a href="http://library.gnome.org/devel/gdk2/gdk2-Points-Rectangles-and-Regions.html#gdk-region-rect-in"><code class="function">gdk_region_rect_in()</code></a></td>
+<td><code class="function">gdk_region_rect_in()</code></td>
 <td><code class="function">cairo_region_contains_rectangle()</code></td>
 </tr>
 <tr>
-<td><a href="http://library.gnome.org/devel/gdk2/gdk2-Points-Rectangles-and-Regions.html#gdk-region-offset"><code class="function">gdk_region_offset()</code></a></td>
+<td><code class="function">gdk_region_offset()</code></td>
 <td><code class="function">cairo_region_translate()</code></td>
 </tr>
 <tr>
-<td><a href="http://library.gnome.org/devel/gdk2/gdk2-Points-Rectangles-and-Regions.html#gdk-region-union-with-rect"><code class="function">gdk_region_union_with_rect()</code></a></td>
+<td><code class="function">gdk_region_union_with_rect()</code></td>
 <td><code class="function">cairo_region_union_rectangle()</code></td>
 </tr>
 <tr>
-<td><a href="http://library.gnome.org/devel/gdk2/gdk2-Points-Rectangles-and-Regions.html#gdk-region-intersect"><code class="function">gdk_region_intersect()</code></a></td>
+<td><code class="function">gdk_region_intersect()</code></td>
 <td><code class="function">cairo_region_intersect()</code></td>
 </tr>
 <tr>
-<td><a href="http://library.gnome.org/devel/gdk2/gdk2-Points-Rectangles-and-Regions.html#gdk-region-union"><code class="function">gdk_region_union()</code></a></td>
+<td><code class="function">gdk_region_union()</code></td>
 <td><code class="function">cairo_region_union()</code></td>
 </tr>
 <tr>
-<td><a href="http://library.gnome.org/devel/gdk2/gdk2-Points-Rectangles-and-Regions.html#gdk-region-subtract"><code class="function">gdk_region_subtract()</code></a></td>
+<td><code class="function">gdk_region_subtract()</code></td>
 <td><code class="function">cairo_region_subtract()</code></td>
 </tr>
 <tr>
-<td><a href="http://library.gnome.org/devel/gdk2/gdk2-Points-Rectangles-and-Regions.html#gdk-region-xor"><code class="function">gdk_region_xor()</code></a></td>
+<td><code class="function">gdk_region_xor()</code></td>
 <td><code class="function">cairo_region_xor()</code></td>
 </tr>
 <tr>
-<td><a href="http://library.gnome.org/devel/gdk2/gdk2-Points-Rectangles-and-Regions.html#gdk-region-shrink"><code class="function">gdk_region_shrink()</code></a></td>
+<td><code class="function">gdk_region_shrink()</code></td>
 <td>no replacement</td>
 </tr>
 <tr>
-<td><a href="http://library.gnome.org/devel/gdk2/gdk2-Points-Rectangles-and-Regions.html#gdk-region-polygon"><code class="function">gdk_region_polygon()</code></a></td>
+<td><code class="function">gdk_region_polygon()</code></td>
 <td>no replacement, use cairo paths instead</td>
 </tr>
 </tbody>
@@ -514,7 +514,7 @@
 <div class="titlepage"><div><div><h3 class="title">
 <a name="id-1.6.3.4.5"></a>Replace GdkPixmap by cairo surfaces</h3></div></div></div>
 <p>
-      The <a href="http://library.gnome.org/devel/gdk2/gdk2-Bitmaps-and-Pixmaps.html#GdkPixmap"><span class="type">GdkPixmap</span></a> object and related functions have been removed.
+      The <span class="type">GdkPixmap</span> object and related functions have been removed.
       In the cairo-centric world of GTK+ 3, cairo surfaces take over
       the role of pixmaps.
     </p>
@@ -544,21 +544,21 @@
 13
 14
 15</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="usertype">GdkCursor</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">cursor</span><span class="symbol">;</span>
-<span class="usertype">GdkPixmap</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">pixmap</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>
-<span class="usertype">GdkColor</span><span class="normal"> fg </span><span class="symbol">=</span><span class="normal"> </span><span class="cbracket">{</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"> </span><span class="number">0</span><span class="symbol">,</span><span class="normal"> </span><span class="number">0</span><span class="normal"> </span><span class="cbracket">}</span><span class="symbol">;</span>
+        <td class="listing_code"><pre class="programlisting">GdkCursor <span class="gtkdoc opt">*</span>cursor<span class="gtkdoc opt">;</span>
+GdkPixmap <span class="gtkdoc opt">*</span>pixmap<span class="gtkdoc opt">;</span>
+cairo_t <span class="gtkdoc opt">*</span>cr<span class="gtkdoc opt">;</span>
+GdkColor fg <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> <span class="number">0</span><span class="gtkdoc opt">,</span> <span class="number">0</span> <span class="gtkdoc opt">};</span>
 
-<span class="normal">pixmap </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="http://library.gnome.org/devel/gdk2/gdk2-Bitmaps-and-Pixmaps.html#gdk-pixmap-new">gdk_pixmap_new</a></span><span class="normal"> </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"> </span><span class="number">1</span><span class="symbol">,</span><span class="normal"> </span><span class="number">1</span><span class="symbol">,</span><span class="normal"> </span><span class="number">1</span><span class="symbol">);</span>
+pixmap <span class="gtkdoc opt">=</span> <span class="function">gdk_pixmap_new</span> <span class="gtkdoc opt">(</span>NULL<span class="gtkdoc opt">,</span> <span class="number">1</span><span class="gtkdoc opt">,</span> <span class="number">1</span><span class="gtkdoc opt">,</span> <span class="number">1</span><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">pixmap</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"> </span><span class="number">1</span><span class="symbol">,</span><span class="normal"> </span><span class="number">1</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>
+cr <span class="gtkdoc opt">=</span> <span class="function">gdk_cairo_create</span> <span class="gtkdoc opt">(</span>pixmap<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> <span class="number">1</span><span class="gtkdoc opt">,</span> <span class="number">1</span><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>
 
-<span class="normal">cursor </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="http://library.gnome.org/devel/gdk2/gdk2-Cursors.html#gdk-cursor-new-from-pixmap">gdk_cursor_new_from_pixmap</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">pixmap</span><span class="symbol">,</span><span class="normal"> pixmap</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">&amp;</span><span class="normal">fg</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">&amp;</span><span class="normal">fg</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>
+cursor <span class="gtkdoc opt">=</span> <span class="function">gdk_cursor_new_from_pixmap</span> <span class="gtkdoc opt">(</span>pixmap<span class="gtkdoc opt">,</span> pixmap<span class="gtkdoc opt">, &amp;</span>fg<span class="gtkdoc opt">, &amp;</span>fg<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>
 
-<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">pixmap</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>pixmap<span class="gtkdoc opt">);</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -592,26 +592,26 @@
 18
 19
 20</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="usertype">GdkCursor</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">cursor</span><span class="symbol">;</span>
-<span class="usertype">cairo_surface_t</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">s</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>
-<span class="usertype">GdkPixbuf</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">pixbuf</span><span class="symbol">;</span>
+        <td class="listing_code"><pre class="programlisting">GdkCursor <span class="gtkdoc opt">*</span>cursor<span class="gtkdoc opt">;</span>
+cairo_surface_t <span class="gtkdoc opt">*</span>s<span class="gtkdoc opt">;</span>
+cairo_t <span class="gtkdoc opt">*</span>cr<span class="gtkdoc opt">;</span>
+GdkPixbuf <span class="gtkdoc opt">*</span>pixbuf<span class="gtkdoc opt">;</span>
 
-<span class="normal">s </span><span class="symbol">=</span><span class="normal"> </span><span class="function">cairo_image_surface_create</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">CAIRO_FORMAT_A1</span><span class="symbol">,</span><span class="normal"> </span><span class="number">3</span><span class="symbol">,</span><span class="normal"> </span><span class="number">3</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">s</span><span class="symbol">);</span>
-<span class="function">cairo_arc</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">1.5</span><span class="symbol">,</span><span class="normal"> </span><span class="number">1.5</span><span class="symbol">,</span><span class="normal"> </span><span class="number">1.5</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">2</span><span class="normal"> </span><span class="symbol">*</span><span class="normal"> M_PI</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>
+s <span class="gtkdoc opt">=</span> <span class="function">cairo_image_surface_create</span> <span class="gtkdoc opt">(</span>CAIRO_FORMAT_A1<span class="gtkdoc opt">,</span> <span class="number">3</span><span class="gtkdoc opt">,</span> <span class="number">3</span><span class="gtkdoc opt">);</span>
+cr <span class="gtkdoc opt">=</span> <span class="function">cairo_create</span> <span class="gtkdoc opt">(</span>s<span class="gtkdoc opt">);</span>
+<span class="function">cairo_arc</span> <span class="gtkdoc opt">(</span>cr<span class="gtkdoc opt">,</span> <span class="number">1.5</span><span class="gtkdoc opt">,</span> <span class="number">1.5</span><span class="gtkdoc opt">,</span> <span class="number">1.5</span><span class="gtkdoc opt">,</span> <span class="number">0</span><span class="gtkdoc opt">,</span> <span class="number">2</span> <span class="gtkdoc opt">*</span> M_PI<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>
 
-<span class="normal">pixbuf </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="http://developer.gnome.org/gdk3/gdk3-Pixbufs.html#gdk-pixbuf-get-from-surface">gdk_pixbuf_get_from_surface</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">s</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">                                      </span><span class="number">3</span><span class="symbol">,</span><span class="normal"> </span><span class="number">3</span><span class="symbol">);</span>
+pixbuf <span class="gtkdoc opt">=</span> <span class="function"><a href="http://developer.gnome.org/gdk3/gdk4-Pixbufs.html#gdk-pixbuf-get-from-surface">gdk_pixbuf_get_from_surface</a></span> <span class="gtkdoc opt">(</span>s<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>
+                                      <span class="number">3</span><span class="gtkdoc opt">,</span> <span class="number">3</span><span class="gtkdoc opt">);</span>
 
-<span class="function">cairo_surface_destroy</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">s</span><span class="symbol">);</span>
+<span class="function">cairo_surface_destroy</span> <span class="gtkdoc opt">(</span>s<span class="gtkdoc opt">);</span>
 
-<span class="normal">cursor </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="http://developer.gnome.org/gdk3/gdk3-Cursors.html#gdk-cursor-new-from-pixbuf">gdk_cursor_new_from_pixbuf</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">display</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="symbol">);</span>
+cursor <span class="gtkdoc opt">=</span> <span class="function"><a href="http://developer.gnome.org/gdk3/gdk4-Cursors.html#gdk-cursor-new-from-pixbuf">gdk_cursor_new_from_pixbuf</a></span> <span class="gtkdoc opt">(</span>display<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><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">pixbuf</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>pixbuf<span class="gtkdoc opt">);</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -628,10 +628,10 @@
 <a name="id-1.6.3.4.6"></a>Replace GdkColormap by GdkVisual</h3></div></div></div>
 <p>
       For drawing with cairo, it is not necessary to allocate colors, and
-      a <a href="http://library.gnome.org/devel/gdk2/gdk2-Visuals.html#GdkVisual"><span class="type">GdkVisual</span></a> provides enough information for cairo to handle colors
-      in 'native' surfaces. Therefore, <a href="http://library.gnome.org/devel/gdk2/gdk2-Colormaps-and-Colors.html#GdkColormap"><span class="type">GdkColormap</span></a> and related functions
+      a <a href="http://developer.gnome.org/gdk3/gdk4-Visuals.html#GdkVisual-struct"><span class="type">GdkVisual</span></a> provides enough information for cairo to handle colors
+      in 'native' surfaces. Therefore, <span class="type">GdkColormap</span> and related functions
       have been removed in GTK+ 3, and visuals are used instead. The
-      colormap-handling functions of <a class="link" href="GtkWidget.html" title="GtkWidget"><span class="type">GtkWidget</span></a> (<a href="http://library.gnome.org/devel/gtk2/GtkWidget.html#gtk-widget-set-colormap"><code class="function">gtk_widget_set_colormap()</code></a>,
+      colormap-handling functions of <a class="link" href="GtkWidget.html" title="GtkWidget"><span class="type">GtkWidget</span></a> (<code class="function">gtk_widget_set_colormap()</code>,
       etc) have been removed and <a class="link" href="GtkWidget.html#gtk-widget-set-visual" title="gtk_widget_set_visual ()"><code class="function">gtk_widget_set_visual()</code></a> has been added.
     </p>
 <div class="example">
@@ -657,19 +657,19 @@
 11
 12
 13</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_alpha_screen_changed</span><span class="normal"> </span><span class="symbol">(</span><span class="usertype">GtkWidget</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">widget</span><span class="symbol">,</span>
-<span class="normal">                         </span><span class="usertype">GdkScreen</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">old_screen</span><span class="symbol">,</span>
-<span class="normal">                         </span><span class="usertype">GtkWidget</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">label</span><span class="symbol">)</span>
-<span class="cbracket">{</span>
-<span class="normal">  </span><span class="usertype">GdkScreen</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">screen </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="GtkWidget.html#gtk-widget-get-screen">gtk_widget_get_screen</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">widget</span><span class="symbol">);</span>
-<span class="normal">  </span><span class="usertype">GdkColormap</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">colormap </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="http://library.gnome.org/devel/gdk2/GdkScreen.html#gdk-screen-get-rgba-colormap">gdk_screen_get_rgba_colormap</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">screen</span><span class="symbol">);</span>
-
-<span class="normal">  </span><span class="keyword">if</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">colormap </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">    colormap </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="http://library.gnome.org/devel/gdk2/GdkScreen.html#gdk-screen-get-default-colormap">gdk_screen_get_default_colormap</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">screen</span><span class="symbol">);</span>
-
-<span class="normal">  </span><span class="function"><a href="http://library.gnome.org/devel/gtk2/GtkWidget.html#gtk-widget-set-colormap">gtk_widget_set_colormap</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">widget</span><span class="symbol">,</span><span class="normal"> colormap</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_alpha_screen_changed</span> <span class="gtkdoc opt">(</span>GtkWidget <span class="gtkdoc opt">*</span>widget<span class="gtkdoc opt">,</span>
+                         GdkScreen <span class="gtkdoc opt">*</span>old_screen<span class="gtkdoc opt">,</span>
+                         GtkWidget <span class="gtkdoc opt">*</span>label<span class="gtkdoc opt">)</span>
+<span class="gtkdoc opt">{</span>
+  GdkScreen <span class="gtkdoc opt">*</span>screen <span class="gtkdoc opt">=</span> <span class="function"><a href="GtkWidget.html#gtk-widget-get-screen">gtk_widget_get_screen</a></span> <span class="gtkdoc opt">(</span>widget<span class="gtkdoc opt">);</span>
+  GdkColormap <span class="gtkdoc opt">*</span>colormap <span class="gtkdoc opt">=</span> <span class="function">gdk_screen_get_rgba_colormap</span> <span class="gtkdoc opt">(</span>screen<span class="gtkdoc opt">);</span>
+
+  <span class="keyword">if</span> <span class="gtkdoc opt">(</span>colormap <span class="gtkdoc opt">==</span> NULL<span class="gtkdoc opt">)</span>
+    colormap <span class="gtkdoc opt">=</span> <span class="function">gdk_screen_get_default_colormap</span> <span class="gtkdoc opt">(</span>screen<span class="gtkdoc opt">);</span>
+
+  <span class="function">gtk_widget_set_colormap</span> <span class="gtkdoc opt">(</span>widget<span class="gtkdoc opt">,</span> colormap<span class="gtkdoc opt">);</span>
+<span class="gtkdoc opt">}</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -695,19 +695,19 @@
 11
 12
 13</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_alpha_screen_changed</span><span class="normal"> </span><span class="symbol">(</span><span class="usertype">GtkWindow</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">window</span><span class="symbol">,</span>
-<span class="normal">                         </span><span class="usertype">GdkScreen</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">old_screen</span><span class="symbol">,</span>
-<span class="normal">                         </span><span class="usertype">GtkWidget</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">label</span><span class="symbol">)</span>
-<span class="cbracket">{</span>
-<span class="normal">  </span><span class="usertype">GdkScreen</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">screen </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="GtkWidget.html#gtk-widget-get-screen">gtk_widget_get_screen</a></span><span class="normal"> </span><span class="symbol">(</span><span class="function">GTK_WIDGET</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">window</span><span class="symbol">));</span>
-<span class="normal">  </span><span class="usertype">GdkVisual</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">visual </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="http://developer.gnome.org/gdk3/GdkScreen.html#gdk-screen-get-rgba-visual">gdk_screen_get_rgba_visual</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">screen</span><span class="symbol">);</span>
-
-<span class="normal">  </span><span class="keyword">if</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">visual </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">    visual </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="http://developer.gnome.org/gdk3/GdkScreen.html#gdk-screen-get-system-visual">gdk_screen_get_system_visual</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">screen</span><span class="symbol">);</span>
-
-<span class="normal">  </span><span class="function"><a href="GtkWidget.html#gtk-widget-set-visual">gtk_widget_set_visual</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">window</span><span class="symbol">,</span><span class="normal"> visual</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_alpha_screen_changed</span> <span class="gtkdoc opt">(</span>GtkWindow <span class="gtkdoc opt">*</span>window<span class="gtkdoc opt">,</span>
+                         GdkScreen <span class="gtkdoc opt">*</span>old_screen<span class="gtkdoc opt">,</span>
+                         GtkWidget <span class="gtkdoc opt">*</span>label<span class="gtkdoc opt">)</span>
+<span class="gtkdoc opt">{</span>
+  GdkScreen <span class="gtkdoc opt">*</span>screen <span class="gtkdoc opt">=</span> <span class="function"><a href="GtkWidget.html#gtk-widget-get-screen">gtk_widget_get_screen</a></span> <span class="gtkdoc opt">(</span><span class="function">GTK_WIDGET</span> <span class="gtkdoc opt">(</span>window<span class="gtkdoc opt">));</span>
+  GdkVisual <span class="gtkdoc opt">*</span>visual <span class="gtkdoc opt">=</span> <span class="function"><a href="http://developer.gnome.org/gdk3/GdkScreen.html#gdk-screen-get-rgba-visual">gdk_screen_get_rgba_visual</a></span> <span class="gtkdoc opt">(</span>screen<span class="gtkdoc opt">);</span>
+
+  <span class="keyword">if</span> <span class="gtkdoc opt">(</span>visual <span class="gtkdoc opt">==</span> NULL<span class="gtkdoc opt">)</span>
+    visual <span class="gtkdoc opt">=</span> <span class="function"><a href="http://developer.gnome.org/gdk3/GdkScreen.html#gdk-screen-get-system-visual">gdk_screen_get_system_visual</a></span> <span class="gtkdoc opt">(</span>screen<span class="gtkdoc opt">);</span>
+
+  <span class="function"><a href="GtkWidget.html#gtk-widget-set-visual">gtk_widget_set_visual</a></span> <span class="gtkdoc opt">(</span>window<span class="gtkdoc opt">,</span> visual<span class="gtkdoc opt">);</span>
+<span class="gtkdoc opt">}</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -721,10 +721,10 @@
 <div class="titlepage"><div><div><h3 class="title">
 <a name="id-1.6.3.4.7"></a>GdkDrawable is gone</h3></div></div></div>
 <p>
-      <a href="http://library.gnome.org/devel/gdk2/gdk2-Drawing-Primitives.html#GdkDrawable-struct"><span class="type">GdkDrawable</span></a> has been removed in GTK+ 3, together with <a href="http://library.gnome.org/devel/gdk2/gdk2-Bitmaps-and-Pixmaps.html#GdkPixmap"><span class="type">GdkPixmap</span></a>
-      and <a href="http://library.gnome.org/devel/gdk2/gdk2-Images.html#GdkImage"><span class="type">GdkImage</span></a>. The only remaining drawable class is <a href="http://library.gnome.org/devel/gdk2/gdk2-Windows.html#GdkWindow"><span class="type">GdkWindow</span></a>.
+      <span class="type">GdkDrawable</span> has been removed in GTK+ 3, together with <span class="type">GdkPixmap</span>
+      and <span class="type">GdkImage</span>. The only remaining drawable class is <a href="http://developer.gnome.org/gdk3/gdk4-Windows.html#GdkWindow-struct"><span class="type">GdkWindow</span></a>.
       For dealing with image data, you should use a <span class="type">cairo_surface_t</span> or
-      a <a href="http://library.gnome.org/devel/gdk-pixbuf/unstable/gdk-pixbuf-The-GdkPixbuf-Structure.html#GdkPixbuf-struct"><span class="type">GdkPixbuf</span></a>.
+      a <span class="type">GdkPixbuf</span>.
     </p>
 <p>
       GdkDrawable functions that are useful with windows have been replaced
@@ -743,27 +743,27 @@
 </tr></thead>
 <tbody>
 <tr>
-<td><a href="http://library.gnome.org/devel/gdk2/gdk2-Drawing-Primitives.html#gdk-drawable-get-visual"><code class="function">gdk_drawable_get_visual()</code></a></td>
-<td><a href="http://developer.gnome.org/gdk3/gdk3-Windows.html#gdk-window-get-visual"><code class="function">gdk_window_get_visual()</code></a></td>
+<td><code class="function">gdk_drawable_get_visual()</code></td>
+<td><code class="function">gdk_window_get_visual()</code></td>
 </tr>
 <tr>
-<td><a href="http://library.gnome.org/devel/gdk2/gdk2-Drawing-Primitives.html#gdk-drawable-get-size"><code class="function">gdk_drawable_get_size()</code></a></td>
+<td><code class="function">gdk_drawable_get_size()</code></td>
 <td>
-<a href="http://developer.gnome.org/gdk3/gdk3-Windows.html#gdk-window-get-width"><code class="function">gdk_window_get_width()</code></a>
-                                                              <a href="http://developer.gnome.org/gdk3/gdk3-Windows.html#gdk-window-get-height"><code class="function">gdk_window_get_height()</code></a>
+<a href="http://developer.gnome.org/gdk3/gdk4-Windows.html#gdk-window-get-width"><code class="function">gdk_window_get_width()</code></a>
+                                                              <a href="http://developer.gnome.org/gdk3/gdk4-Windows.html#gdk-window-get-height"><code class="function">gdk_window_get_height()</code></a>
 </td>
 </tr>
 <tr>
-<td><a href="http://library.gnome.org/devel/gdk2/gdk2-Pixbufs.html#gdk-pixbuf-get-from-drawable"><code class="function">gdk_pixbuf_get_from_drawable()</code></a></td>
-<td><a href="http://developer.gnome.org/gdk3/gdk3-Pixbufs.html#gdk-pixbuf-get-from-window"><code class="function">gdk_pixbuf_get_from_window()</code></a></td>
+<td><code class="function">gdk_pixbuf_get_from_drawable()</code></td>
+<td><a href="http://developer.gnome.org/gdk3/gdk4-Pixbufs.html#gdk-pixbuf-get-from-window"><code class="function">gdk_pixbuf_get_from_window()</code></a></td>
 </tr>
 <tr>
-<td><a href="http://library.gnome.org/devel/gdk2/gdk2-Drawing-Primitives.html#gdk-drawable-get-clip-region"><code class="function">gdk_drawable_get_clip_region()</code></a></td>
-<td><a href="http://developer.gnome.org/gdk3/gdk3-Windows.html#gdk-window-get-clip-region"><code class="function">gdk_window_get_clip_region()</code></a></td>
+<td><code class="function">gdk_drawable_get_clip_region()</code></td>
+<td><a href="http://developer.gnome.org/gdk3/gdk4-Windows.html#gdk-window-get-clip-region"><code class="function">gdk_window_get_clip_region()</code></a></td>
 </tr>
 <tr>
-<td><a href="http://library.gnome.org/devel/gdk2/gdk2-Drawing-Primitives.html#gdk-drawable-get-visible-region"><code class="function">gdk_drawable_get_visible_region()</code></a></td>
-<td><a href="http://developer.gnome.org/gdk3/gdk3-Windows.html#gdk-window-get-visible-region"><code class="function">gdk_window_get_visible_region()</code></a></td>
+<td><code class="function">gdk_drawable_get_visible_region()</code></td>
+<td><a href="http://developer.gnome.org/gdk3/gdk4-Windows.html#gdk-window-get-visible-region"><code class="function">gdk_window_get_visible_region()</code></a></td>
 </tr>
 </tbody>
 </table></div>
@@ -779,9 +779,9 @@
       there are some changes you need to be aware of.
     </p>
 <p>
-      The special-purpose GdkEventClient events and the <a href="http://library.gnome.org/devel/gdk2/gdk2-Events.html#gdk-add-client-message-filter"><code class="function">gdk_add_client_message_filter()</code></a> and <a href="http://library.gnome.org/devel/gdk2/GdkDisplay.html#gdk-display-add-client-message-filter"><code class="function">gdk_display_add_client_message_filter()</code></a> functions have been
+      The special-purpose GdkEventClient events and the <code class="function">gdk_add_client_message_filter()</code> and <code class="function">gdk_display_add_client_message_filter()</code> functions have been
       removed. Receiving X11 ClientMessage events is still possible, using
-      the general <a href="http://developer.gnome.org/gdk3/gdk3-Windows.html#gdk-window-add-filter"><code class="function">gdk_window_add_filter()</code></a> API. A client message filter like
+      the general <a href="http://developer.gnome.org/gdk3/gdk4-Windows.html#gdk-window-add-filter"><code class="function">gdk_window_add_filter()</code></a> API. A client message filter like
 </p>
 <div class="informalexample">
   <table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
@@ -799,18 +799,18 @@
 10
 11
 12</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="keyword">static</span><span class="normal"> <a href="http://developer.gnome.org/gdk3/gdk3-Windows.html#GdkFilterReturn">GdkFilterReturn</a></span>
-<span class="function">message_filter</span><span class="normal"> </span><span class="symbol">(</span><span class="usertype">GdkXEvent</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">xevent</span><span class="symbol">,</span><span class="normal"> </span><span class="usertype">GdkEvent</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">event</span><span class="symbol">,</span><span class="normal"> </span><span class="usertype">gpointer</span><span class="normal"> data</span><span class="symbol">)</span>
-<span class="cbracket">{</span>
-<span class="normal">  </span><span class="usertype">XClientMessageEvent</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">evt </span><span class="symbol">=</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">XClientMessageEvent </span><span class="symbol">*)</span><span class="normal">xevent</span><span class="symbol">;</span>
+        <td class="listing_code"><pre class="programlisting"><span class="gtkdoc kwb">static</span> GdkFilterReturn
+<span class="function">message_filter</span> <span class="gtkdoc opt">(</span>GdkXEvent <span class="gtkdoc opt">*</span>xevent<span class="gtkdoc opt">,</span> GdkEvent <span class="gtkdoc opt">*</span>event<span class="gtkdoc opt">,</span> gpointer data<span class="gtkdoc opt">)</span>
+<span class="gtkdoc opt">{</span>
+  XClientMessageEvent <span class="gtkdoc opt">*</span>evt <span class="gtkdoc opt">= (</span>XClientMessageEvent <span class="gtkdoc opt">*)</span>xevent<span class="gtkdoc opt">;</span>
 
-<span class="normal">  </span><span class="comment">/* do something with evt ... */</span>
-<span class="cbracket">}</span>
+  <span class="comment">/* do something with evt ... */</span>
+<span class="gtkdoc opt">}</span>
 
-<span class="normal"> </span><span class="symbol">...</span>
+ <span class="gtkdoc opt">...</span>
 
-<span class="normal">message_type </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="http://developer.gnome.org/gdk3/gdk3-Properties-and-Atoms.html#gdk-atom-intern">gdk_atom_intern</a></span><span class="normal"> </span><span class="symbol">(</span><span class="string">"MANAGER"</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="http://library.gnome.org/devel/gdk2/GdkDisplay.html#gdk-display-add-client-message-filter">gdk_display_add_client_message_filter</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">display</span><span class="symbol">,</span><span class="normal"> message_type</span><span class="symbol">,</span><span class="normal"> message_filter</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>
+message_type <span class="gtkdoc opt">=</span> <span class="function"><a href="http://developer.gnome.org/gdk3/gdk4-Properties-and-Atoms.html#gdk-atom-intern">gdk_atom_intern</a></span> <span class="gtkdoc opt">(</span><span class="string">&quot;MANAGER&quot;</span><span class="gtkdoc opt">,</span> FALSE<span class="gtkdoc opt">);</span>
+<span class="function">gdk_display_add_client_message_filter</span> <span class="gtkdoc opt">(</span>display<span class="gtkdoc opt">,</span> message_type<span class="gtkdoc opt">,</span> message_filter<span class="gtkdoc opt">,</span> NULL<span class="gtkdoc opt">);</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -844,27 +844,27 @@
 19
 20
 21</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="keyword">static</span><span class="normal"> <a href="http://developer.gnome.org/gdk3/gdk3-Windows.html#GdkFilterReturn">GdkFilterReturn</a></span>
-<span class="function">event_filter</span><span class="normal"> </span><span class="symbol">(</span><span class="usertype">GdkXEvent</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">xevent</span><span class="symbol">,</span><span class="normal"> </span><span class="usertype">GdkEvent</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">event</span><span class="symbol">,</span><span class="normal"> </span><span class="usertype">gpointer</span><span class="normal"> data</span><span class="symbol">)</span>
-<span class="cbracket">{</span>
-<span class="normal">  </span><span class="usertype">XClientMessageEvent</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">evt</span><span class="symbol">;</span>
-<span class="normal">  </span><span class="usertype">GdkAtom</span><span class="normal"> message_type</span><span class="symbol">;</span>
+        <td class="listing_code"><pre class="programlisting"><span class="gtkdoc kwb">static</span> GdkFilterReturn
+<span class="function">event_filter</span> <span class="gtkdoc opt">(</span>GdkXEvent <span class="gtkdoc opt">*</span>xevent<span class="gtkdoc opt">,</span> GdkEvent <span class="gtkdoc opt">*</span>event<span class="gtkdoc opt">,</span> gpointer data<span class="gtkdoc opt">)</span>
+<span class="gtkdoc opt">{</span>
+  XClientMessageEvent <span class="gtkdoc opt">*</span>evt<span class="gtkdoc opt">;</span>
+  GdkAtom message_type<span class="gtkdoc opt">;</span>
 
-<span class="normal">  </span><span class="keyword">if</span><span class="normal"> </span><span class="symbol">(((</span><span class="normal">XEvent </span><span class="symbol">*)</span><span class="normal">xevent</span><span class="symbol">)-&gt;</span><span class="normal">type </span><span class="symbol">!=</span><span class="normal"> ClientMessage</span><span class="symbol">)</span>
-<span class="normal">    </span><span class="keyword">return</span><span class="normal"> <a href="http://developer.gnome.org/gdk3/gdk3-Windows.html#GDK-FILTER-CONTINUE:CAPS">GDK_FILTER_CONTINUE</a></span><span class="symbol">;</span>
+  <span class="keyword">if</span> <span class="gtkdoc opt">(((</span>XEvent <span class="gtkdoc opt">*)</span>xevent<span class="gtkdoc opt">)-&gt;</span>type <span class="gtkdoc opt">!=</span> ClientMessage<span class="gtkdoc opt">)</span>
+    <span class="keyword">return</span> GDK_FILTER_CONTINUE<span class="gtkdoc opt">;</span>
 
-<span class="normal">  evt </span><span class="symbol">=</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">XClientMessageEvent </span><span class="symbol">*)</span><span class="normal">xevent</span><span class="symbol">;</span>
-<span class="normal">  message_type </span><span class="symbol">=</span><span class="normal"> </span><span class="function">XInternAtom</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">evt</span><span class="symbol">-&gt;</span><span class="normal">display</span><span class="symbol">,</span><span class="normal"> </span><span class="string">"MANAGER"</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>
+  evt <span class="gtkdoc opt">= (</span>XClientMessageEvent <span class="gtkdoc opt">*)</span>xevent<span class="gtkdoc opt">;</span>
+  message_type <span class="gtkdoc opt">=</span> <span class="function">XInternAtom</span> <span class="gtkdoc opt">(</span>evt<span class="gtkdoc opt">-&gt;</span>display<span class="gtkdoc opt">,</span> <span class="string">&quot;MANAGER&quot;</span><span class="gtkdoc opt">,</span> FALSE<span class="gtkdoc opt">);</span>
 
-<span class="normal">  </span><span class="keyword">if</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">evt</span><span class="symbol">-&gt;</span><span class="normal">message_type </span><span class="symbol">!=</span><span class="normal"> message_type</span><span class="symbol">)</span>
-<span class="normal">    </span><span class="keyword">return</span><span class="normal"> <a href="http://developer.gnome.org/gdk3/gdk3-Windows.html#GDK-FILTER-CONTINUE:CAPS">GDK_FILTER_CONTINUE</a></span><span class="symbol">;</span>
+  <span class="keyword">if</span> <span class="gtkdoc opt">(</span>evt<span class="gtkdoc opt">-&gt;</span>message_type <span class="gtkdoc opt">!=</span> message_type<span class="gtkdoc opt">)</span>
+    <span class="keyword">return</span> GDK_FILTER_CONTINUE<span class="gtkdoc opt">;</span>
 
-<span class="normal">  </span><span class="comment">/* do something with evt ... */</span>
-<span class="cbracket">}</span>
+  <span class="comment">/* do something with evt ... */</span>
+<span class="gtkdoc opt">}</span>
 
-<span class="normal"> </span><span class="symbol">...</span>
+ <span class="gtkdoc opt">...</span>
 
-<span class="function"><a href="http://developer.gnome.org/gdk3/gdk3-Windows.html#gdk-window-add-filter">gdk_window_add_filter</a></span><span class="normal"> </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"> message_filter</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"><a href="http://developer.gnome.org/gdk3/gdk4-Windows.html#gdk-window-add-filter">gdk_window_add_filter</a></span> <span class="gtkdoc opt">(</span>NULL<span class="gtkdoc opt">,</span> message_filter<span class="gtkdoc opt">,</span> NULL<span class="gtkdoc opt">);</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -873,7 +873,7 @@
 <p>
       One advantage of using an event filter is that you can actually
       remove the filter when you don't need it anymore, using
-      <a href="http://developer.gnome.org/gdk3/gdk3-Windows.html#gdk-window-remove-filter"><code class="function">gdk_window_remove_filter()</code></a>.
+      <a href="http://developer.gnome.org/gdk3/gdk4-Windows.html#gdk-window-remove-filter"><code class="function">gdk_window_remove_filter()</code></a>.
     </p>
 <p>
       The other difference to be aware of when working with event filters
@@ -891,7 +891,7 @@
 <a name="id-1.6.3.4.9"></a>Backend-specific code</h3></div></div></div>
 <p>
       In GTK+ 2.x, GDK could only be compiled for one backend at a time,
-      and the <a href="http://developer.gnome.org/gdk3/gdk3-General.html#GDK-WINDOWING-X11:CAPS"><code class="literal">GDK_WINDOWING_X11</code></a> or <a href="http://developer.gnome.org/gdk3/gdk3-General.html#GDK-WINDOWING-WIN32:CAPS"><code class="literal">GDK_WINDOWING_WIN32</code></a> macros could
+      and the <a href="http://developer.gnome.org/gdk3/gdk4-General.html#GDK-WINDOWING-X11:CAPS"><code class="literal">GDK_WINDOWING_X11</code></a> or <code class="literal">GDK_WINDOWING_WIN32</code> macros could
       be used to find out which one you are dealing with:
       </p>
 <div class="informalexample">
@@ -905,13 +905,13 @@
 5
 6
 7</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="preproc">#ifdef</span><span class="normal"> <a href="http://developer.gnome.org/gdk3/gdk3-General.html#GDK-WINDOWING-X11:CAPS">GDK_WINDOWING_X11</a></span>
-<span class="normal">      </span><span class="keyword">if</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">timestamp </span><span class="symbol">!=</span><span class="normal"> <a href="http://developer.gnome.org/gdk3/gdk3-Events.html#GDK-CURRENT-TIME:CAPS">GDK_CURRENT_TIME</a></span><span class="symbol">)</span>
-<span class="normal">        </span><span class="function"><a href="http://developer.gnome.org/gdk3/gdk3-X-Window-System-Interaction.html#gdk-x11-window-set-user-time">gdk_x11_window_set_user_time</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">gdk_window</span><span class="symbol">,</span><span class="normal"> timestamp</span><span class="symbol">);</span>
-<span class="preproc">#endif</span>
-<span class="preproc">#ifdef</span><span class="normal"> <a href="http://developer.gnome.org/gdk3/gdk3-General.html#GDK-WINDOWING-WIN32:CAPS">GDK_WINDOWING_WIN32</a></span>
-<span class="normal">        </span><span class="comment">/* ... win32 specific code ... */</span>
-<span class="preproc">#endif</span></pre></td>
+        <td class="listing_code"><pre class="programlisting"><span class="gtkdoc ppc">#ifdef GDK_WINDOWING_X11</span>
+      <span class="keyword">if</span> <span class="gtkdoc opt">(</span>timestamp <span class="gtkdoc opt">!=</span> GDK_CURRENT_TIME<span class="gtkdoc opt">)</span>
+        <span class="function"><a href="http://developer.gnome.org/gdk3/gdk4-X-Window-System-Interaction.html#gdk-x11-window-set-user-time">gdk_x11_window_set_user_time</a></span> <span class="gtkdoc opt">(</span>gdk_window<span class="gtkdoc opt">,</span> timestamp<span class="gtkdoc opt">);</span>
+<span class="gtkdoc ppc">#endif</span>
+<span class="gtkdoc ppc">#ifdef GDK_WINDOWING_WIN32</span>
+        <span class="comment">/* ... win32 specific code ... */</span>
+<span class="gtkdoc ppc">#endif</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -920,7 +920,7 @@
 <p>
       In GTK+ 3, GDK can be built with multiple backends, and currently
       used backend has to be determined at runtime, typically using
-      type-check macros on a <a href="http://developer.gnome.org/gdk3/GdkDisplay.html#GdkDisplay-struct"><span class="type">GdkDisplay</span></a> or <a href="http://library.gnome.org/devel/gdk2/gdk2-Windows.html#GdkWindow"><span class="type">GdkWindow</span></a>. You still need
+      type-check macros on a <a href="http://developer.gnome.org/gdk3/GdkDisplay.html#GdkDisplay-struct"><span class="type">GdkDisplay</span></a> or <a href="http://developer.gnome.org/gdk3/gdk4-Windows.html#GdkWindow-struct"><span class="type">GdkWindow</span></a>. You still need
       to use the GDK_WINDOWING macros to only compile code referring
       to supported backends:
       </p>
@@ -946,24 +946,24 @@
 16
 17
 18</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="preproc">#ifdef</span><span class="normal"> <a href="http://developer.gnome.org/gdk3/gdk3-General.html#GDK-WINDOWING-X11:CAPS">GDK_WINDOWING_X11</a></span>
-<span class="normal">      </span><span class="keyword">if</span><span class="normal"> </span><span class="symbol">(</span><span class="function">GDK_IS_X11_DISPLAY</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">display</span><span class="symbol">))</span>
-<span class="normal">        </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">timestamp </span><span class="symbol">!=</span><span class="normal"> <a href="http://developer.gnome.org/gdk3/gdk3-Events.html#GDK-CURRENT-TIME:CAPS">GDK_CURRENT_TIME</a></span><span class="symbol">)</span>
-<span class="normal">            </span><span class="function"><a href="http://developer.gnome.org/gdk3/gdk3-X-Window-System-Interaction.html#gdk-x11-window-set-user-time">gdk_x11_window_set_user_time</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">gdk_window</span><span class="symbol">,</span><span class="normal"> timestamp</span><span class="symbol">);</span>
-<span class="normal">        </span><span class="cbracket">}</span>
-<span class="normal">      </span><span class="keyword">else</span>
-<span class="preproc">#endif</span>
-<span class="preproc">#ifdef</span><span class="normal"> <a href="http://developer.gnome.org/gdk3/gdk3-General.html#GDK-WINDOWING-WIN32:CAPS">GDK_WINDOWING_WIN32</a></span>
-<span class="normal">      </span><span class="keyword">if</span><span class="normal"> </span><span class="symbol">(</span><span class="function">GDK_IS_WIN32_DISPLAY</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">display</span><span class="symbol">))</span>
-<span class="normal">        </span><span class="cbracket">{</span>
-<span class="normal">          </span><span class="comment">/* ... win32 specific code ... */</span>
-<span class="normal">        </span><span class="cbracket">}</span>
-<span class="normal">      </span><span class="keyword">else</span>
-<span class="preproc">#endif</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">"Unsupported GDK backend"</span><span class="symbol">);</span>
-<span class="normal">       </span><span class="cbracket">}</span></pre></td>
+        <td class="listing_code"><pre class="programlisting"><span class="gtkdoc ppc">#ifdef GDK_WINDOWING_X11</span>
+      <span class="keyword">if</span> <span class="gtkdoc opt">(</span><span class="function">GDK_IS_X11_DISPLAY</span> <span class="gtkdoc opt">(</span>display<span class="gtkdoc opt">))</span>
+        <span class="gtkdoc opt">{</span>
+          <span class="keyword">if</span> <span class="gtkdoc opt">(</span>timestamp <span class="gtkdoc opt">!=</span> GDK_CURRENT_TIME<span class="gtkdoc opt">)</span>
+            <span class="function"><a href="http://developer.gnome.org/gdk3/gdk4-X-Window-System-Interaction.html#gdk-x11-window-set-user-time">gdk_x11_window_set_user_time</a></span> <span class="gtkdoc opt">(</span>gdk_window<span class="gtkdoc opt">,</span> timestamp<span class="gtkdoc opt">);</span>
+        <span class="gtkdoc opt">}</span>
+      <span class="keyword">else</span>
+<span class="gtkdoc ppc">#endif</span>
+<span class="gtkdoc ppc">#ifdef GDK_WINDOWING_WIN32</span>
+      <span class="keyword">if</span> <span class="gtkdoc opt">(</span><span class="function">GDK_IS_WIN32_DISPLAY</span> <span class="gtkdoc opt">(</span>display<span class="gtkdoc opt">))</span>
+        <span class="gtkdoc opt">{</span>
+          <span class="comment">/* ... win32 specific code ... */</span>
+        <span class="gtkdoc opt">}</span>
+      <span class="keyword">else</span>
+<span class="gtkdoc ppc">#endif</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;Unsupported GDK backend&quot;</span><span class="gtkdoc opt">);</span>
+       <span class="gtkdoc opt">}</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -981,7 +981,7 @@
     <tbody>
       <tr>
         <td class="listing_lines" align="right"><pre>1</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="function">AM_CONDITIONAL</span><span class="symbol">(</span><span class="normal">BUILD_X11</span><span class="symbol">,</span><span class="normal"> test `$PKG_CONFIG </span><span class="symbol">--</span><span class="normal">variable</span><span class="symbol">=</span><span class="usertype">target</span><span class="normal"> gtk</span><span class="symbol">+-</span><span class="number">2.0</span><span class="normal">` </span><span class="symbol">=</span><span class="normal"> </span><span class="string">"x11"</span><span class="symbol">)</span></pre></td>
+        <td class="listing_code"><pre class="programlisting"><span class="function">AM_CONDITIONAL</span><span class="gtkdoc opt">(</span>BUILD_X11<span class="gtkdoc opt">,</span> test `$PKG_CONFIG <span class="gtkdoc opt">--</span>variable<span class="gtkdoc opt">=</span>target gtk<span class="gtkdoc opt">+-</span><span class="number">2.0</span>` <span class="gtkdoc opt">=</span> <span class="string">&quot;x11&quot;</span><span class="gtkdoc opt">)</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -996,8 +996,8 @@
       <tr>
         <td class="listing_lines" align="right"><pre>1
 2</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="function">GTK_CHECK_BACKEND</span><span class="symbol">([</span><span class="normal">x11</span><span class="symbol">],</span><span class="normal"> </span><span class="symbol">[</span><span class="number">3.0</span><span class="symbol">.</span><span class="number">2</span><span class="symbol">],</span><span class="normal"> </span><span class="symbol">[</span><span class="normal">have_x11</span><span class="symbol">=</span><span class="normal">yes</span><span class="symbol">],</span><span class="normal"> </span><span class="symbol">[</span><span class="normal">have_x11</span><span class="symbol">=</span><span class="normal">no</span><span class="symbol">])</span>
-<span class="function">AM_CONDITIONAL</span><span class="symbol">(</span><span class="normal">BUILD_x11</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">[</span><span class="normal">test </span><span class="string">"x$have_x11"</span><span class="normal"> </span><span class="symbol">=</span><span class="normal"> </span><span class="string">"xyes"</span><span class="symbol">])</span></pre></td>
+        <td class="listing_code"><pre class="programlisting"><span class="function">GTK_CHECK_BACKEND</span><span class="gtkdoc opt">([</span>x11<span class="gtkdoc opt">], [</span><span class="number">3.0.2</span><span class="gtkdoc opt">], [</span>have_x11<span class="gtkdoc opt">=</span>yes<span class="gtkdoc opt">], [</span>have_x11<span class="gtkdoc opt">=</span>no<span class="gtkdoc opt">])</span>
+<span class="function">AM_CONDITIONAL</span><span class="gtkdoc opt">(</span>BUILD_x11<span class="gtkdoc opt">, [</span>test <span class="string">&quot;x$have_x11&quot;</span> <span class="gtkdoc opt">=</span> <span class="string">&quot;xyes&quot;</span><span class="gtkdoc opt">])</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -1020,7 +1020,7 @@
 <div class="titlepage"><div><div><h3 class="title">
 <a name="id-1.6.3.4.11"></a>The GtkWidget::draw signal</h3></div></div></div>
 <p>
-      The GtkWidget <a href="http://library.gnome.org/devel/gtk2/GtkWidget.html#GtkWidget-expose-event"><span class="type">“expose-event”</span></a> signal has been replaced by
+      The GtkWidget <span class="type">“expose-event”</span> signal has been replaced by
       a new <a class="link" href="GtkWidget.html#GtkWidget-draw" title="The “draw” signal"><span class="type">“draw”</span></a> signal, which takes a <span class="type">cairo_t</span> instead of
       an expose event. The cairo context is being set up so that the origin
       at (0, 0) coincides with the upper left corner of the widget, and
@@ -1057,15 +1057,15 @@
 7
 8
 9</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="keyword">if</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">event</span><span class="symbol">-&gt;</span><span class="normal">window </span><span class="symbol">==</span><span class="normal"> widget</span><span class="symbol">-&gt;</span><span class="normal">window1</span><span class="symbol">)</span>
-<span class="normal">  </span><span class="cbracket">{</span>
-<span class="normal">     </span><span class="comment">/* ... draw window1 ... */</span>
-<span class="normal">  </span><span class="cbracket">}</span>
-<span class="keyword">else</span><span class="normal"> </span><span class="keyword">if</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">event</span><span class="symbol">-&gt;</span><span class="normal">window </span><span class="symbol">==</span><span class="normal"> widget</span><span class="symbol">-&gt;</span><span class="normal">window2</span><span class="symbol">)</span>
-<span class="normal">  </span><span class="cbracket">{</span>
-<span class="normal">     </span><span class="comment">/* ... draw window2 ... */</span>
-<span class="normal">  </span><span class="cbracket">}</span>
-<span class="symbol">...</span></pre></td>
+        <td class="listing_code"><pre class="programlisting"><span class="keyword">if</span> <span class="gtkdoc opt">(</span>event<span class="gtkdoc opt">-&gt;</span>window <span class="gtkdoc opt">==</span> widget<span class="gtkdoc opt">-&gt;</span>window1<span class="gtkdoc opt">)</span>
+  <span class="gtkdoc opt">{</span>
+     <span class="comment">/* ... draw window1 ... */</span>
+  <span class="gtkdoc opt">}</span>
+<span class="keyword">else if</span> <span class="gtkdoc opt">(</span>event<span class="gtkdoc opt">-&gt;</span>window <span class="gtkdoc opt">==</span> widget<span class="gtkdoc opt">-&gt;</span>window2<span class="gtkdoc opt">)</span>
+  <span class="gtkdoc opt">{</span>
+     <span class="comment">/* ... draw window2 ... */</span>
+  <span class="gtkdoc opt">}</span>
+<span class="gtkdoc opt">...</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -1091,15 +1091,15 @@
 7
 8
 9</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="keyword">if</span><span class="normal"> </span><span class="symbol">(</span><span class="function"><a href="GtkWidget.html#gtk-cairo-should-draw-window">gtk_cairo_should_draw_window</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">,</span><span class="normal"> widget</span><span class="symbol">-&gt;</span><span class="normal">window1</span><span class="symbol">)</span>
-<span class="normal">  </span><span class="cbracket">{</span>
-<span class="normal">     </span><span class="comment">/* ... draw window1 ... */</span>
-<span class="normal">  </span><span class="cbracket">}</span>
-<span class="keyword">if</span><span class="normal"> </span><span class="symbol">(</span><span class="function"><a href="GtkWidget.html#gtk-cairo-should-draw-window">gtk_cairo_should_draw_window</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">cr</span><span class="symbol">,</span><span class="normal"> widget</span><span class="symbol">-&gt;</span><span class="normal">window2</span><span class="symbol">)</span>
-<span class="normal">  </span><span class="cbracket">{</span>
-<span class="normal">     </span><span class="comment">/* ... draw window2 ... */</span>
-<span class="normal">  </span><span class="cbracket">}</span>
-<span class="symbol">...</span></pre></td>
+        <td class="listing_code"><pre class="programlisting"><span class="keyword">if</span> <span class="gtkdoc opt">(</span><span class="function"><a href="GtkWidget.html#gtk-cairo-should-draw-window">gtk_cairo_should_draw_window</a></span> <span class="gtkdoc opt">(</span>cr<span class="gtkdoc opt">,</span> widget<span class="gtkdoc opt">-&gt;</span>window1<span class="gtkdoc opt">)</span>
+  <span class="gtkdoc opt">{</span>
+     <span class="comment">/* ... draw window1 ... */</span>
+  <span class="gtkdoc opt">}</span>
+<span class="keyword">if</span> <span class="gtkdoc opt">(</span><span class="function"><a href="GtkWidget.html#gtk-cairo-should-draw-window">gtk_cairo_should_draw_window</a></span> <span class="gtkdoc opt">(</span>cr<span class="gtkdoc opt">,</span> widget<span class="gtkdoc opt">-&gt;</span>window2<span class="gtkdoc opt">)</span>
+  <span class="gtkdoc opt">{</span>
+     <span class="comment">/* ... draw window2 ... */</span>
+  <span class="gtkdoc opt">}</span>
+<span class="gtkdoc opt">...</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -1144,26 +1144,26 @@
 18
 19
 20</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="normal"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean">gboolean</a></span>
-<span class="function">gtk_arrow_draw</span><span class="normal"> </span><span class="symbol">(</span><span class="usertype">GtkWidget</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">widget</span><span class="symbol">,</span>
-<span class="normal">                </span><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="cbracket">{</span>
-<span class="normal">  </span><span class="usertype">GtkStyleContext</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">context</span><span class="symbol">;</span>
-<span class="normal">  </span><span class="usertype">gint</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="usertype">gint</span><span class="normal"> width</span><span class="symbol">,</span><span class="normal"> height</span><span class="symbol">;</span>
-<span class="normal">  </span><span class="usertype">gint</span><span class="normal"> extent</span><span class="symbol">;</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">  width </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="GtkWidget.html#gtk-widget-get-allocated-width">gtk_widget_get_allocated_width</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">widget</span><span class="symbol">);</span>
-<span class="normal">  height </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="GtkWidget.html#gtk-widget-get-allocated-height">gtk_widget_get_allocated_height</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">widget</span><span class="symbol">);</span>
-
-<span class="normal">  extent </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#MIN:CAPS">MIN</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">width </span><span class="symbol">-</span><span class="normal"> </span><span class="number">2</span><span class="normal"> </span><span class="symbol">*</span><span class="normal"> PAD</span><span class="symbol">,</span><span class="normal"> height </span><span class="symbol">-</span><span class="normal"> </span><span class="number">2</span><span class="normal"> </span><span class="symbol">*</span><span class="normal"> PAD</span><span class="symbol">);</span>
-<span class="normal">  x </span><span class="symbol">=</span><span class="normal"> PAD</span><span class="symbol">;</span>
-<span class="normal">  y </span><span class="symbol">=</span><span class="normal"> PAD</span><span class="symbol">;</span>
-
-<span class="normal">  </span><span class="function"><a href="GtkStyleContext.html#gtk-render-arrow">gtk_render_arrow</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">context</span><span class="symbol">,</span><span class="normal"> rc</span><span class="symbol">,</span><span class="normal"> <a href="https://developer.gnome.org/glib/unstable/glib-Numerical-Definitions.html#G-PI:CAPS">G_PI</a> </span><span class="symbol">/</span><span class="normal"> </span><span class="number">2</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"> extent</span><span class="symbol">);</span>
-<span class="cbracket">}</span></pre></td>
+        <td class="listing_code"><pre class="programlisting">gboolean
+<span class="function">gtk_arrow_draw</span> <span class="gtkdoc opt">(</span>GtkWidget <span class="gtkdoc opt">*</span>widget<span class="gtkdoc opt">,</span>
+                cairo_t   <span class="gtkdoc opt">*</span>cr<span class="gtkdoc opt">)</span>
+<span class="gtkdoc opt">{</span>
+  GtkStyleContext <span class="gtkdoc opt">*</span>context<span class="gtkdoc opt">;</span>
+  gint x<span class="gtkdoc opt">,</span> y<span class="gtkdoc opt">;</span>
+  gint width<span class="gtkdoc opt">,</span> height<span class="gtkdoc opt">;</span>
+  gint extent<span class="gtkdoc opt">;</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>
+
+  width <span class="gtkdoc opt">=</span> <span class="function"><a href="GtkWidget.html#gtk-widget-get-allocated-width">gtk_widget_get_allocated_width</a></span> <span class="gtkdoc opt">(</span>widget<span class="gtkdoc opt">);</span>
+  height <span class="gtkdoc opt">=</span> <span class="function"><a href="GtkWidget.html#gtk-widget-get-allocated-height">gtk_widget_get_allocated_height</a></span> <span class="gtkdoc opt">(</span>widget<span class="gtkdoc opt">);</span>
+
+  extent <span class="gtkdoc opt">=</span> <span class="function"><a href="/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/share/gtk-doc/html/glib/glib-Standard-Macros.html#MIN:CAPS">MIN</a></span> <span class="gtkdoc opt">(</span>width <span class="gtkdoc opt">-</span> <span class="number">2</span> <span class="gtkdoc opt">*</span> PAD<span class="gtkdoc opt">,</span> height <span class="gtkdoc opt">-</span> <span class="number">2</span> <span class="gtkdoc opt">*</span> PAD<span class="gtkdoc opt">);</span>
+  x <span class="gtkdoc opt">=</span> PAD<span class="gtkdoc opt">;</span>
+  y <span class="gtkdoc opt">=</span> PAD<span class="gtkdoc opt">;</span>
+
+  <span class="function"><a href="GtkStyleContext.html#gtk-render-arrow">gtk_render_arrow</a></span> <span class="gtkdoc opt">(</span>context<span class="gtkdoc opt">,</span> rc<span class="gtkdoc opt">,</span> G_PI <span class="gtkdoc opt">/</span> <span class="number">2</span><span class="gtkdoc opt">,</span> x<span class="gtkdoc opt">,</span> y<span class="gtkdoc opt">,</span> extent<span class="gtkdoc opt">);</span>
+<span class="gtkdoc opt">}</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -1180,7 +1180,7 @@
       GtkProgressBarOrientation enumeration to specify their orientation and
       direction. In GTK+ 3, both the widget and the cell renderer implement
       <a class="link" href="gtk3-Orientable.html#GtkOrientable"><span class="type">GtkOrientable</span></a>, and have an additional 'inverted' property to determine
-      their direction. Therefore, a call to <a href="http://library.gnome.org/devel/gtk2/GtkProgressBar.html#gtk-progress-bar-set-orientation"><code class="function">gtk_progress_bar_set_orientation()</code></a>
+      their direction. Therefore, a call to <code class="function">gtk_progress_bar_set_orientation()</code>
       needs to be replaced by a pair of calls to
       <a class="link" href="gtk3-Orientable.html#gtk-orientable-set-orientation" title="gtk_orientable_set_orientation ()"><code class="function">gtk_orientable_set_orientation()</code></a> and <a class="link" href="GtkProgressBar.html#gtk-progress-bar-set-inverted" title="gtk_progress_bar_set_inverted ()"><code class="function">gtk_progress_bar_set_inverted()</code></a>.
       The following values correspond:
@@ -1273,8 +1273,8 @@
       GtkObject has been removed in GTK+ 3. Its remaining functionality,
       the ::destroy signal, has been moved to GtkWidget. If you have non-widget
       classes that are directly derived from GtkObject, you have to make
-      them derive from <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GInitiallyUnowned"><span class="type">GInitiallyUnowned</span></a> (or, if you don't need the floating
-      functionality, <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct"><span class="type">GObject</span></a>). If you have widgets that override the
+      them derive from <a href="/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GInitiallyUnowned"><span class="type">GInitiallyUnowned</span></a> (or, if you don't need the floating
+      functionality, <a href="/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObject-struct"><span class="type">GObject</span></a>). If you have widgets that override the
       destroy class handler, you have to adjust your class_init function,
       since destroy is now a member of GtkWidgetClass:
       </p>
@@ -1285,9 +1285,9 @@
         <td class="listing_lines" align="right"><pre>1
 2
 3</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="usertype">GtkObjectClass</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">object_class </span><span class="symbol">=</span><span class="normal"> </span><span class="function">GTK_OBJECT_CLASS</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">class</span><span class="symbol">);</span>
+        <td class="listing_code"><pre class="programlisting">GtkObjectClass <span class="gtkdoc opt">*</span>object_class <span class="gtkdoc opt">=</span> <span class="function">GTK_OBJECT_CLASS</span> <span class="gtkdoc opt">(</span><span class="gtkdoc kwc">class</span><span class="gtkdoc opt">);</span>
 
-<span class="normal">object_class</span><span class="symbol">-&gt;</span><span class="normal">destroy </span><span class="symbol">=</span><span class="normal"> my_destroy</span><span class="symbol">;</span></pre></td>
+object_class<span class="gtkdoc opt">-&gt;</span>destroy <span class="gtkdoc opt">=</span> my_destroy<span class="gtkdoc opt">;</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -1303,9 +1303,9 @@
         <td class="listing_lines" align="right"><pre>1
 2
 3</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="usertype">GtkWidgetClass</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">widget_class </span><span class="symbol">=</span><span class="normal"> </span><span class="function">GTK_WIDGET_CLASS</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">class</span><span class="symbol">);</span>
+        <td class="listing_code"><pre class="programlisting">GtkWidgetClass <span class="gtkdoc opt">*</span>widget_class <span class="gtkdoc opt">=</span> <span class="function">GTK_WIDGET_CLASS</span> <span class="gtkdoc opt">(</span><span class="gtkdoc kwc">class</span><span class="gtkdoc opt">);</span>
 
-<span class="normal">widget_class</span><span class="symbol">-&gt;</span><span class="normal">destroy </span><span class="symbol">=</span><span class="normal"> my_destroy</span><span class="symbol">;</span></pre></td>
+widget_class<span class="gtkdoc opt">-&gt;</span>destroy <span class="gtkdoc opt">=</span> my_destroy<span class="gtkdoc opt">;</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -1343,7 +1343,7 @@
      The resize grip functionality has been moved from <a class="link" href="GtkStatusbar.html" title="GtkStatusbar"><span class="type">GtkStatusbar</span></a>
      to <a class="link" href="GtkWindow.html" title="GtkWindow"><span class="type">GtkWindow</span></a>. Any window can now have resize grips, regardless whether
      it has a statusbar or not. The functions
-     <a href="http://library.gnome.org/devel/gtk2/GtkStatusbar.html#gtk-statusbar-set-has-resize-grip"><code class="function">gtk_statusbar_set_has_resize_grip()</code></a> and <a href="http://library.gnome.org/devel/gtk2/GtkStatusbar.html#gtk-statusbar-get-has-resize-grip"><code class="function">gtk_statusbar_get_has_resize_grip()</code></a>
+     <code class="function">gtk_statusbar_set_has_resize_grip()</code> and <code class="function">gtk_statusbar_get_has_resize_grip()</code>
      have disappeared, and instead there are now
      <a class="link" href="GtkWindow.html#gtk-window-set-has-resize-grip" title="gtk_window_set_has_resize_grip ()"><code class="function">gtk_window_set_has_resize_grip()</code></a> and <a class="link" href="GtkWindow.html#gtk-window-get-has-resize-grip" title="gtk_window_get_has_resize_grip ()"><code class="function">gtk_window_get_has_resize_grip()</code></a>.
     </p>