summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog28
-rw-r--r--ChangeLog.pre-2-028
-rw-r--r--ChangeLog.pre-2-1028
-rw-r--r--ChangeLog.pre-2-228
-rw-r--r--ChangeLog.pre-2-428
-rw-r--r--ChangeLog.pre-2-628
-rw-r--r--ChangeLog.pre-2-828
-rw-r--r--INSTALL4
-rw-r--r--NEWS35
-rw-r--r--README2
-rw-r--r--configure.in2
-rw-r--r--docs/faq/Makefile.am2
-rw-r--r--gdk/gdkevents.c4
-rw-r--r--gdk/gdkimage.c8
-rw-r--r--gdk/gdkwindow.h10
-rw-r--r--gdk/x11/gdkwindow-x11.c1
-rw-r--r--gtk/gtkcellrenderertoggle.c2
-rw-r--r--gtk/gtkdnd.c2
-rw-r--r--gtk/gtkentry.c2
-rw-r--r--gtk/gtkmain.h7
-rw-r--r--gtk/gtkrc.c6
-rw-r--r--gtk/gtktreemodel.c2
22 files changed, 257 insertions, 28 deletions
diff --git a/ChangeLog b/ChangeLog
index b5641e14f..1f2678542 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,31 @@
+Wed Nov 21 15:21:26 2001 Owen Taylor <otaylor@redhat.com>
+
+ * configure.in (GTK_MICRO_VERSION): Version 1.3.11,
+ interface, binary age 0.
+
+ * NEWS: Updates
+
+ * gtk/gtktreemodel.c gtk/gtkrc.c gtk/gtkentry.c: SGML
+ fixes in docs.
+
+ * gtk/gtkmain.h: Remove unused and misnamespaced
+ get_gtk_win32_directory() prototype.
+
+ * gdk/gdkimage.c (gdk_image_get): Fix parameter names
+ to match header.
+
+ * gdk/gdkwindow.h: Fix parameters to gdk_window_shape_combine_mask(),
+ gdk_window_set_transient_for(), gdk_window_set_geometry_hints(),
+ to match docs.
+
+ * gdk/gdkevents.c (gdk_event_get_coords)
+ gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_get_active)
+ gtk/gtkdnd.c (gtk_drag_set_icon_stock):
+ Fix parameter names in docs.
+
+ * docs/faq/Makefile.am (FAQ_FILES): Add missing files.
+ (#64961, Akira Tagoh)
+
Wed Nov 21 11:41:29 2001 Owen Taylor <otaylor@redhat.com>
* tests/testgtk.c (create_tooltips): Ref-sink the tooltips object.
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index b5641e14f..1f2678542 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,31 @@
+Wed Nov 21 15:21:26 2001 Owen Taylor <otaylor@redhat.com>
+
+ * configure.in (GTK_MICRO_VERSION): Version 1.3.11,
+ interface, binary age 0.
+
+ * NEWS: Updates
+
+ * gtk/gtktreemodel.c gtk/gtkrc.c gtk/gtkentry.c: SGML
+ fixes in docs.
+
+ * gtk/gtkmain.h: Remove unused and misnamespaced
+ get_gtk_win32_directory() prototype.
+
+ * gdk/gdkimage.c (gdk_image_get): Fix parameter names
+ to match header.
+
+ * gdk/gdkwindow.h: Fix parameters to gdk_window_shape_combine_mask(),
+ gdk_window_set_transient_for(), gdk_window_set_geometry_hints(),
+ to match docs.
+
+ * gdk/gdkevents.c (gdk_event_get_coords)
+ gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_get_active)
+ gtk/gtkdnd.c (gtk_drag_set_icon_stock):
+ Fix parameter names in docs.
+
+ * docs/faq/Makefile.am (FAQ_FILES): Add missing files.
+ (#64961, Akira Tagoh)
+
Wed Nov 21 11:41:29 2001 Owen Taylor <otaylor@redhat.com>
* tests/testgtk.c (create_tooltips): Ref-sink the tooltips object.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b5641e14f..1f2678542 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,31 @@
+Wed Nov 21 15:21:26 2001 Owen Taylor <otaylor@redhat.com>
+
+ * configure.in (GTK_MICRO_VERSION): Version 1.3.11,
+ interface, binary age 0.
+
+ * NEWS: Updates
+
+ * gtk/gtktreemodel.c gtk/gtkrc.c gtk/gtkentry.c: SGML
+ fixes in docs.
+
+ * gtk/gtkmain.h: Remove unused and misnamespaced
+ get_gtk_win32_directory() prototype.
+
+ * gdk/gdkimage.c (gdk_image_get): Fix parameter names
+ to match header.
+
+ * gdk/gdkwindow.h: Fix parameters to gdk_window_shape_combine_mask(),
+ gdk_window_set_transient_for(), gdk_window_set_geometry_hints(),
+ to match docs.
+
+ * gdk/gdkevents.c (gdk_event_get_coords)
+ gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_get_active)
+ gtk/gtkdnd.c (gtk_drag_set_icon_stock):
+ Fix parameter names in docs.
+
+ * docs/faq/Makefile.am (FAQ_FILES): Add missing files.
+ (#64961, Akira Tagoh)
+
Wed Nov 21 11:41:29 2001 Owen Taylor <otaylor@redhat.com>
* tests/testgtk.c (create_tooltips): Ref-sink the tooltips object.
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index b5641e14f..1f2678542 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,31 @@
+Wed Nov 21 15:21:26 2001 Owen Taylor <otaylor@redhat.com>
+
+ * configure.in (GTK_MICRO_VERSION): Version 1.3.11,
+ interface, binary age 0.
+
+ * NEWS: Updates
+
+ * gtk/gtktreemodel.c gtk/gtkrc.c gtk/gtkentry.c: SGML
+ fixes in docs.
+
+ * gtk/gtkmain.h: Remove unused and misnamespaced
+ get_gtk_win32_directory() prototype.
+
+ * gdk/gdkimage.c (gdk_image_get): Fix parameter names
+ to match header.
+
+ * gdk/gdkwindow.h: Fix parameters to gdk_window_shape_combine_mask(),
+ gdk_window_set_transient_for(), gdk_window_set_geometry_hints(),
+ to match docs.
+
+ * gdk/gdkevents.c (gdk_event_get_coords)
+ gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_get_active)
+ gtk/gtkdnd.c (gtk_drag_set_icon_stock):
+ Fix parameter names in docs.
+
+ * docs/faq/Makefile.am (FAQ_FILES): Add missing files.
+ (#64961, Akira Tagoh)
+
Wed Nov 21 11:41:29 2001 Owen Taylor <otaylor@redhat.com>
* tests/testgtk.c (create_tooltips): Ref-sink the tooltips object.
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index b5641e14f..1f2678542 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,31 @@
+Wed Nov 21 15:21:26 2001 Owen Taylor <otaylor@redhat.com>
+
+ * configure.in (GTK_MICRO_VERSION): Version 1.3.11,
+ interface, binary age 0.
+
+ * NEWS: Updates
+
+ * gtk/gtktreemodel.c gtk/gtkrc.c gtk/gtkentry.c: SGML
+ fixes in docs.
+
+ * gtk/gtkmain.h: Remove unused and misnamespaced
+ get_gtk_win32_directory() prototype.
+
+ * gdk/gdkimage.c (gdk_image_get): Fix parameter names
+ to match header.
+
+ * gdk/gdkwindow.h: Fix parameters to gdk_window_shape_combine_mask(),
+ gdk_window_set_transient_for(), gdk_window_set_geometry_hints(),
+ to match docs.
+
+ * gdk/gdkevents.c (gdk_event_get_coords)
+ gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_get_active)
+ gtk/gtkdnd.c (gtk_drag_set_icon_stock):
+ Fix parameter names in docs.
+
+ * docs/faq/Makefile.am (FAQ_FILES): Add missing files.
+ (#64961, Akira Tagoh)
+
Wed Nov 21 11:41:29 2001 Owen Taylor <otaylor@redhat.com>
* tests/testgtk.c (create_tooltips): Ref-sink the tooltips object.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b5641e14f..1f2678542 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,31 @@
+Wed Nov 21 15:21:26 2001 Owen Taylor <otaylor@redhat.com>
+
+ * configure.in (GTK_MICRO_VERSION): Version 1.3.11,
+ interface, binary age 0.
+
+ * NEWS: Updates
+
+ * gtk/gtktreemodel.c gtk/gtkrc.c gtk/gtkentry.c: SGML
+ fixes in docs.
+
+ * gtk/gtkmain.h: Remove unused and misnamespaced
+ get_gtk_win32_directory() prototype.
+
+ * gdk/gdkimage.c (gdk_image_get): Fix parameter names
+ to match header.
+
+ * gdk/gdkwindow.h: Fix parameters to gdk_window_shape_combine_mask(),
+ gdk_window_set_transient_for(), gdk_window_set_geometry_hints(),
+ to match docs.
+
+ * gdk/gdkevents.c (gdk_event_get_coords)
+ gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_get_active)
+ gtk/gtkdnd.c (gtk_drag_set_icon_stock):
+ Fix parameter names in docs.
+
+ * docs/faq/Makefile.am (FAQ_FILES): Add missing files.
+ (#64961, Akira Tagoh)
+
Wed Nov 21 11:41:29 2001 Owen Taylor <otaylor@redhat.com>
* tests/testgtk.c (create_tooltips): Ref-sink the tooltips object.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b5641e14f..1f2678542 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,31 @@
+Wed Nov 21 15:21:26 2001 Owen Taylor <otaylor@redhat.com>
+
+ * configure.in (GTK_MICRO_VERSION): Version 1.3.11,
+ interface, binary age 0.
+
+ * NEWS: Updates
+
+ * gtk/gtktreemodel.c gtk/gtkrc.c gtk/gtkentry.c: SGML
+ fixes in docs.
+
+ * gtk/gtkmain.h: Remove unused and misnamespaced
+ get_gtk_win32_directory() prototype.
+
+ * gdk/gdkimage.c (gdk_image_get): Fix parameter names
+ to match header.
+
+ * gdk/gdkwindow.h: Fix parameters to gdk_window_shape_combine_mask(),
+ gdk_window_set_transient_for(), gdk_window_set_geometry_hints(),
+ to match docs.
+
+ * gdk/gdkevents.c (gdk_event_get_coords)
+ gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_get_active)
+ gtk/gtkdnd.c (gtk_drag_set_icon_stock):
+ Fix parameter names in docs.
+
+ * docs/faq/Makefile.am (FAQ_FILES): Add missing files.
+ (#64961, Akira Tagoh)
+
Wed Nov 21 11:41:29 2001 Owen Taylor <otaylor@redhat.com>
* tests/testgtk.c (create_tooltips): Ref-sink the tooltips object.
diff --git a/INSTALL b/INSTALL
index f002dc759..609e44ad0 100644
--- a/INSTALL
+++ b/INSTALL
@@ -20,8 +20,8 @@ GTK+ requires the following packages:
Simple install procedure
========================
- % gzip -cd gtk+-1.3.10.tar.gz | tar xvf - # unpack the sources
- % cd gtk+-1.3.10 # change to the toplevel directory
+ % gzip -cd gtk+-1.3.11.tar.gz | tar xvf - # unpack the sources
+ % cd gtk+-1.3.11 # change to the toplevel directory
% ./configure # run the `configure' script
% make # build GTK
[ Become root if necessary ]
diff --git a/NEWS b/NEWS
index 1ac3238dc..db3014be5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,38 @@
+Overview of Changes in GTK+ 1.3.11
+==================================
+
+* Massive rework of accelerator API and implementation (Tim Janik)
+* Major fixes to resizing and redrawing to eliminate hysteresis
+ and optimize. (Owen Taylor, Soeren Sandmann)
+* Make many widgets NO_WINDOW to improve appearance and reduce
+ drawing overhead (Owen)
+* Text view fixes (Havoc Pennington)
+* Make child widgets in GtkTextView work (Havoc)
+* GtkTreeModelSort fixage (Jonathan Blandford, Kristian Rietveld)
+* Clean up GtkTreeView drag and drop support (Owen)
+* Misc tree view fixes and improvements (Jonathan, Kristian, Anders, Matt Wilson)
+* Add gtk_window_get/set_focus(), gtk_window_set_default() as public
+ functions (Owen, Damian Ivereigh)
+* Fixes to GtkPlug/GtkSocket (Michael Meeks, Owen)
+* Change button ordering in standard dialogs to correspond to
+ GNOME useability project proposal (Gregory Merchan)
+* Add support for context sensitivity in input methods (Owen)
+* Hook up gtk_im_context_set_use_preedit() (Hidetoshi Tajima)
+* Fix gdk_window_scroll() and other aspects of big windows (Owen)
+* Remove need for X connection for class initialization (Jacob Berkman)
+* Propagate key events to parents of focused widget (Owen)
+* Don't export normal GTK+ marshalers, export deprecated compat marshalers (Owen)
+* Many Win32 Fixes and improvements (Hans Breuer, Tor Lillqvist)
+* Bug and documentation fixing (Matthias Clasen, Anders Carlsson,
+ Jacob Berkman, others.)
+
+Other Contributors:
+ Darin Adler, Marius Andreiana, Erwann Chenede, Murray Cumming, Janet Davis,
+ Daniel Egger, Daniel Elstner, Jeff Franks, Alex Larsson, George Lebl,
+ Sergey Kuzminov, Eric Lemings, Arkadiusz Miskiewicz, Padraig O'Briain, Sven Neumann,
+ Kristian Rietveld, Nicolas Setton, Manish Singh, Vitaly Tishkov, Sebastian Wilhelmi,
+ Michael Natterer
+
Overview of Changes in GTK+ 1.3.10
==================================
diff --git a/README b/README
index 7cc299456..cc6728fc2 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
General Information
===================
-This is GTK+ version 1.3.10. GTK+, which stands for the Gimp ToolKit,
+This is GTK+ version 1.3.11. GTK+, which stands for the Gimp ToolKit,
is a library for creating graphical user interfaces for the X Window
System. It is designed to be small, efficient, and flexible. GTK+ is
written in C with a very object-oriented approach.
diff --git a/configure.in b/configure.in
index 5b9f09ee9..143260f50 100644
--- a/configure.in
+++ b/configure.in
@@ -34,7 +34,7 @@ GLIB_AC_DIVERT_BEFORE_HELP([
#
GTK_MAJOR_VERSION=1
GTK_MINOR_VERSION=3
-GTK_MICRO_VERSION=10
+GTK_MICRO_VERSION=11
GTK_INTERFACE_AGE=0
GTK_BINARY_AGE=0
GTK_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION
diff --git a/docs/faq/Makefile.am b/docs/faq/Makefile.am
index 1a8b4e622..bf5868775 100644
--- a/docs/faq/Makefile.am
+++ b/docs/faq/Makefile.am
@@ -8,6 +8,8 @@ FAQ_FILES=html/gtkfaq.html \
html/gtkfaq-5.html \
html/gtkfaq-6.html \
html/gtkfaq-7.html \
+ html/gtkfaq-8.html \
+ html/gtkfaq-9.html \
text/gtkfaq.txt
$(FAQ_FILES): faq
diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c
index a7a4b81bd..4b9219553 100644
--- a/gdk/gdkevents.c
+++ b/gdk/gdkevents.c
@@ -552,8 +552,8 @@ gdk_event_get_state (GdkEvent *event,
/**
* gdk_event_get_coords:
* @event: a #GdkEvent
- * @x_root: location to put event window x coordinate
- * @y_root: location to put event window y coordinate
+ * @x_win: location to put event window x coordinate
+ * @y_win: location to put event window y coordinate
*
* Extract the event window relative x/y coordinates from an event.
*
diff --git a/gdk/gdkimage.c b/gdk/gdkimage.c
index 76ecc7eec..71ae136e0 100644
--- a/gdk/gdkimage.c
+++ b/gdk/gdkimage.c
@@ -61,7 +61,7 @@ gdk_image_unref (GdkImage *image)
/**
* gdk_image_get:
- * @window: a #GdkWindow
+ * @drawable: a #GdkDrawable
* @x: x coordinate in @window
* @y: y coordinate in @window
* @width: width of area in @window
@@ -75,19 +75,19 @@ gdk_image_unref (GdkImage *image)
* Return value: a new #GdkImage or %NULL
**/
GdkImage*
-gdk_image_get (GdkWindow *window,
+gdk_image_get (GdkWindow *drawable,
gint x,
gint y,
gint width,
gint height)
{
- g_return_val_if_fail (GDK_IS_DRAWABLE (window), NULL);
+ g_return_val_if_fail (GDK_IS_DRAWABLE (drawable), NULL);
g_return_val_if_fail (x >= 0, NULL);
g_return_val_if_fail (y >= 0, NULL);
g_return_val_if_fail (width >= 0, NULL);
g_return_val_if_fail (height >= 0, NULL);
- return gdk_drawable_get_image (window, x, y, width, height);
+ return gdk_drawable_get_image (drawable, y, width, height);
}
/**
diff --git a/gdk/gdkwindow.h b/gdk/gdkwindow.h
index eae6d9baa..9383c7a25 100644
--- a/gdk/gdkwindow.h
+++ b/gdk/gdkwindow.h
@@ -333,9 +333,9 @@ void gdk_window_scroll (GdkWindow *window,
* from gdk_pixmap_create_from_xpm. Stefan Wille
*/
void gdk_window_shape_combine_mask (GdkWindow *window,
- GdkBitmap *shape_mask,
- gint offset_x,
- gint offset_y);
+ GdkBitmap *mask,
+ gint x,
+ gint y);
void gdk_window_shape_combine_region (GdkWindow *window,
GdkRegion *shape_region,
gint offset_x,
@@ -399,7 +399,7 @@ void gdk_window_set_modal_hint (GdkWindow *window,
gboolean modal);
void gdk_window_set_geometry_hints (GdkWindow *window,
GdkGeometry *geometry,
- GdkWindowHints flags);
+ GdkWindowHints geom_mask);
void gdk_set_sm_client_id (const gchar *sm_client_id);
void gdk_window_begin_paint_rect (GdkWindow *window,
@@ -413,7 +413,7 @@ void gdk_window_set_title (GdkWindow *window,
void gdk_window_set_role (GdkWindow *window,
const gchar *role);
void gdk_window_set_transient_for (GdkWindow *window,
- GdkWindow *leader);
+ GdkWindow *parent);
void gdk_window_set_background (GdkWindow *window,
GdkColor *color);
void gdk_window_set_back_pixmap (GdkWindow *window,
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 265558bfb..f7811d899 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -4459,6 +4459,7 @@ emulate_move_drag (GdkWindow *window,
/**
* gdk_window_begin_resize_drag:
* @window: a #GdkWindow
+ * @edge: the edge or corner from which the drag is started
* @button: the button being used to drag
* @root_x: root window X coordinate of mouse click that began the drag
* @root_y: root window Y coordinate of mouse click that began the drag
diff --git a/gtk/gtkcellrenderertoggle.c b/gtk/gtkcellrenderertoggle.c
index 79ca1cd37..67e290c42 100644
--- a/gtk/gtkcellrenderertoggle.c
+++ b/gtk/gtkcellrenderertoggle.c
@@ -396,7 +396,7 @@ gtk_cell_renderer_toggle_get_radio (GtkCellRendererToggle *toggle)
/**
* gtk_cell_renderer_toggle_get_active:
- * @check_menu_item: a #GtkCellRendererToggle
+ * @toggle: a #GtkCellRendererToggle
*
* Returns whether the cell renderer is active. See
* gtk_cell_renderer_toggle_set_active().
diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index 0a61e0bf1..7e4edbf85 100644
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -2200,7 +2200,7 @@ gtk_drag_set_icon_pixbuf (GdkDragContext *context,
* gtk_drag_set_icon_stock:
* @context: the context for a drag. (This must be called
* with a context for the source side of a drag)
- * @stock: the ID of the stock icon to use for the drag.
+ * @stock_id: the ID of the stock icon to use for the drag.
* @hot_x: the X offset within the icon of the hotspot.
* @hot_y: the Y offset within the icon of the hotspot.
*
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index f64791704..88ad409bf 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -3507,7 +3507,7 @@ gtk_entry_get_activates_default (GtkEntry *entry)
*
* Changes the size request of the entry to be about the right size
* for @n_chars characters. Note that it changes the size
- * <emphasize>request</emphasize>, the size can still be affected by
+ * <emphasis>request</emphasis>, the size can still be affected by
* how you pack the widget into containers. If @n_chars is -1, the
* size reverts to the default entry size.
*
diff --git a/gtk/gtkmain.h b/gtk/gtkmain.h
index 93a6d4c95..97b24b98a 100644
--- a/gtk/gtkmain.h
+++ b/gtk/gtkmain.h
@@ -109,13 +109,6 @@ gboolean gtk_init_check_abi_check (int *argc,
#endif
-#ifdef G_OS_WIN32
-/* don't hard-code any absolute directory but calculate then from
- * regristy settings or gtk-*.*.dll placement.
- */
-gchar *get_gtk_win32_directory (gchar *subdir);
-#endif
-
#ifndef GTK_DISABLE_DEPRECATED
void gtk_exit (gint error_code);
#endif /* GTK_DISABLE_DEPRECATED */
diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c
index 806896adf..d60b09a84 100644
--- a/gtk/gtkrc.c
+++ b/gtk/gtkrc.c
@@ -1506,10 +1506,12 @@ gtk_rc_get_style (GtkWidget *widget)
*
* The action of gtk_rc_get_style() is similar to:
*
- * gtk_widget_path (widget, NULL, &path, NULL);
- * gtk_widget_class_path (widget, NULL, &class_path, NULL);
+ * <programlisting>
+ * gtk_widget_path (widget, NULL, &amp;path, NULL);
+ * gtk_widget_class_path (widget, NULL, &amp;class_path, NULL);
* gtk_rc_get_style_by_paths (gtk_widget_get_settings (widget), path, class_path,
* G_OBJECT_TYPE (widget));
+ * </programlisting>
*
* Return value: A style created by matching with the supplied paths,
* or %NULL if nothign matching was specified and the default style should
diff --git a/gtk/gtktreemodel.c b/gtk/gtktreemodel.c
index ec0e8f07e..e71c5b26f 100644
--- a/gtk/gtktreemodel.c
+++ b/gtk/gtktreemodel.c
@@ -960,7 +960,7 @@ gtk_tree_model_unref_node (GtkTreeModel *tree_model,
* each column number followed by a place to store the value being
* retrieved. The list is terminated by a -1. For example, to get a
* value from column 0 with type %G_TYPE_STRING, you would
- * write: gtk_tree_model_get (model, iter, 0, &place_string_here, -1),
+ * write: <literal>gtk_tree_model_get (model, iter, 0, &amp;place_string_here, -1)</literal>,
* where place_string_here is a gchar* to be filled with the string.
* If appropriate, the returned values have to be freed or unreferenced.
*
View Lorry Controller Status