diff --git a/ChangeLog b/ChangeLog index 2d63204710..263767a40e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2002-09-01 Soeren Sandmann + + * gtk/gtkimcontext.c, gtk/gtktreeviewcolumn.c: + + Minor documentation fixes. + (#80021, Yao Zhang; #75567, #75279, Vitaly Tishkov) + 2002-09-28 Matthias Clasen * gdk/x11/gdkwindow-x11.c (_gdk_windowing_window_init): Make diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 2d63204710..263767a40e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2002-09-01 Soeren Sandmann + + * gtk/gtkimcontext.c, gtk/gtktreeviewcolumn.c: + + Minor documentation fixes. + (#80021, Yao Zhang; #75567, #75279, Vitaly Tishkov) + 2002-09-28 Matthias Clasen * gdk/x11/gdkwindow-x11.c (_gdk_windowing_window_init): Make diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 2d63204710..263767a40e 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +2002-09-01 Soeren Sandmann + + * gtk/gtkimcontext.c, gtk/gtktreeviewcolumn.c: + + Minor documentation fixes. + (#80021, Yao Zhang; #75567, #75279, Vitaly Tishkov) + 2002-09-28 Matthias Clasen * gdk/x11/gdkwindow-x11.c (_gdk_windowing_window_init): Make diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 2d63204710..263767a40e 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +2002-09-01 Soeren Sandmann + + * gtk/gtkimcontext.c, gtk/gtktreeviewcolumn.c: + + Minor documentation fixes. + (#80021, Yao Zhang; #75567, #75279, Vitaly Tishkov) + 2002-09-28 Matthias Clasen * gdk/x11/gdkwindow-x11.c (_gdk_windowing_window_init): Make diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 2d63204710..263767a40e 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +2002-09-01 Soeren Sandmann + + * gtk/gtkimcontext.c, gtk/gtktreeviewcolumn.c: + + Minor documentation fixes. + (#80021, Yao Zhang; #75567, #75279, Vitaly Tishkov) + 2002-09-28 Matthias Clasen * gdk/x11/gdkwindow-x11.c (_gdk_windowing_window_init): Make diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 2d63204710..263767a40e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +2002-09-01 Soeren Sandmann + + * gtk/gtkimcontext.c, gtk/gtktreeviewcolumn.c: + + Minor documentation fixes. + (#80021, Yao Zhang; #75567, #75279, Vitaly Tishkov) + 2002-09-28 Matthias Clasen * gdk/x11/gdkwindow-x11.c (_gdk_windowing_window_init): Make diff --git a/docs/reference/gdk-pixbuf/tmpl/animation.sgml b/docs/reference/gdk-pixbuf/tmpl/animation.sgml index a795d09ea3..5b0f4d83ae 100644 --- a/docs/reference/gdk-pixbuf/tmpl/animation.sgml +++ b/docs/reference/gdk-pixbuf/tmpl/animation.sgml @@ -20,12 +20,6 @@ Animated images. #GdkPixbufLoader - - - This object describes an individual frame of an animation. - - - This object describes an animation. diff --git a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml index 2ac542e845..3c67abbc71 100644 --- a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml +++ b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml @@ -365,6 +365,12 @@ XlibRGB @obj: A GTK+ object. + + + This object describes an individual frame of an animation. + + + diff --git a/docs/reference/gdk/tmpl/event_structs.sgml b/docs/reference/gdk/tmpl/event_structs.sgml index 09b24f6605..0ce711925b 100644 --- a/docs/reference/gdk/tmpl/event_structs.sgml +++ b/docs/reference/gdk/tmpl/event_structs.sgml @@ -466,6 +466,7 @@ Specifies the state of a toplevel window. @GDK_WINDOW_STATE_ICONIFIED: the window is minimized. @GDK_WINDOW_STATE_MAXIMIZED: the window is maximized. @GDK_WINDOW_STATE_STICKY: the window is sticky. +@GDK_WINDOW_STATE_FULLSCREEN: diff --git a/docs/reference/gdk/tmpl/events.sgml b/docs/reference/gdk/tmpl/events.sgml index 592be2f672..131fed144a 100644 --- a/docs/reference/gdk/tmpl/events.sgml +++ b/docs/reference/gdk/tmpl/events.sgml @@ -274,8 +274,10 @@ gdk_event_handler_set(). @event: -@xid: +@winid: @Returns: + +@xid: @@ -285,8 +287,10 @@ gdk_event_handler_set(). @display: @event: -@xid: +@winid: @Returns: + +@xid: diff --git a/docs/reference/gdk/tmpl/fonts.sgml b/docs/reference/gdk/tmpl/fonts.sgml index 832ab862e9..eba6864a14 100644 --- a/docs/reference/gdk/tmpl/fonts.sgml +++ b/docs/reference/gdk/tmpl/fonts.sgml @@ -584,25 +584,6 @@ relation to the baseline. See gdk_text_extents(). @Returns: the height of the character in pixels. - - -Returns a comma-separated list of XLFDs for the -fonts making up a given #GdkFont. - - -@font: a #GdkFont -@Returns: a newly-allocated string containing a list of XLFDs, - should be freed with gdk_font_full_name_free() when no longer needed. - - - - -Frees a full font name obtained from gdk_font_full_name_get(). - - -@name: a full font name. - - Specifies a wide character type, used to represent character codes. diff --git a/docs/reference/gdk/tmpl/gdk-unused.sgml b/docs/reference/gdk/tmpl/gdk-unused.sgml index 68015589b6..6d161312a4 100644 --- a/docs/reference/gdk/tmpl/gdk-unused.sgml +++ b/docs/reference/gdk/tmpl/gdk-unused.sgml @@ -596,6 +596,23 @@ status information, so the application does not need to do anything. + + +Frees a full font name obtained from gdk_font_full_name_get(). + + +@name: a full font name. + + + +Returns a comma-separated list of XLFDs for the +fonts making up a given #GdkFont. + + +@font: a #GdkFont +@Returns: a newly-allocated string containing a list of XLFDs, + should be freed with gdk_font_full_name_free() when no longer needed. + @@ -910,3 +927,12 @@ they will be ignored. @display: + + + + + +@screen: +@xvisualid: +@Returns: + diff --git a/docs/reference/gdk/tmpl/windows.sgml b/docs/reference/gdk/tmpl/windows.sgml index c1c91e1e75..53fcc69bfb 100644 --- a/docs/reference/gdk/tmpl/windows.sgml +++ b/docs/reference/gdk/tmpl/windows.sgml @@ -197,6 +197,10 @@ and behaviour of the window. The hint must be set before mapping the window. @GDK_WINDOW_TYPE_HINT_DIALOG: Dialog window. @GDK_WINDOW_TYPE_HINT_MENU: Window used to implement a menu. @GDK_WINDOW_TYPE_HINT_TOOLBAR: Window used to implement toolbars. +@GDK_WINDOW_TYPE_HINT_SPLASHSCREEN: +@GDK_WINDOW_TYPE_HINT_UTILITY: +@GDK_WINDOW_TYPE_HINT_DOCK: +@GDK_WINDOW_TYPE_HINT_DESKTOP: diff --git a/docs/reference/gdk/tmpl/x_interaction.sgml b/docs/reference/gdk/tmpl/x_interaction.sgml index fe42e9ac83..fec8a43d95 100644 --- a/docs/reference/gdk/tmpl/x_interaction.sgml +++ b/docs/reference/gdk/tmpl/x_interaction.sgml @@ -259,16 +259,6 @@ Returns a #GdkVisual corresponding to a X visual. @Returns: the #GdkVisual. - - - - - -@screen: -@xvisualid: -@Returns: - - diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml index 4d2776cfb7..bd4999a4a3 100644 --- a/docs/reference/gtk/tmpl/gtk-unused.sgml +++ b/docs/reference/gtk/tmpl/gtk-unused.sgml @@ -2638,15 +2638,6 @@ Sets the function that GTK+ will use to load images @ruler: the gtkruler - - -Internal function. - - -@widget: -@event: -@Returns: - Internal function. diff --git a/docs/reference/gtk/tmpl/gtkselection.sgml b/docs/reference/gtk/tmpl/gtkselection.sgml index 37177cf57e..a3f582ed40 100644 --- a/docs/reference/gtk/tmpl/gtkselection.sgml +++ b/docs/reference/gtk/tmpl/gtkselection.sgml @@ -284,6 +284,16 @@ called by applications. @widget: a #GtkWidget + + +Internal function. + + +@widget: +@event: +@Returns: + + Makes a copy of a #GtkSelectionData structure and its data. diff --git a/docs/reference/gtk/tmpl/gtksettings.sgml b/docs/reference/gtk/tmpl/gtksettings.sgml index 6207dc848b..0a20182b15 100644 --- a/docs/reference/gtk/tmpl/gtksettings.sgml +++ b/docs/reference/gtk/tmpl/gtksettings.sgml @@ -209,6 +209,11 @@ GtkSettings + + + + + diff --git a/docs/reference/gtk/tmpl/gtkwindow.sgml b/docs/reference/gtk/tmpl/gtkwindow.sgml index c2fe9419c0..d973842873 100644 --- a/docs/reference/gtk/tmpl/gtkwindow.sgml +++ b/docs/reference/gtk/tmpl/gtkwindow.sgml @@ -844,6 +844,21 @@ Deprecated alias for gtk_window_set_position(). + + + + + + + + + + + + + + + diff --git a/gtk/gtkimcontext.c b/gtk/gtkimcontext.c index 6a4d0eb608..51287e040e 100644 --- a/gtk/gtkimcontext.c +++ b/gtk/gtkimcontext.c @@ -390,7 +390,8 @@ gtk_im_context_reset (GtkIMContext *context) * @area: new location * * Notify the input method that a change in cursor - * position has been made. + * position has been made. The location is relative to the client + * window. **/ void gtk_im_context_set_cursor_location (GtkIMContext *context, diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c index 957c8b793b..86df4839a2 100644 --- a/gtk/gtktreeviewcolumn.c +++ b/gtk/gtktreeviewcolumn.c @@ -1210,8 +1210,9 @@ gtk_tree_view_column_get_cell_info (GtkTreeViewColumn *tree_column, * @cell: The #GtkCellRenderer. * @expand: %TRUE if @cell is to be given extra space allocated to box. * - * Packs the @cell into the beginning column. If @expand is %TRUE, then the - * @cell is allocated a share of all available space that the @tree_column has. + * Packs the @cell into the beginning of the column. If @expand is FALSE, then + * the @cell is allocated no more space than it needs. Any unused space is divided + * evenly between cells for which @expand is TRUE. **/ void gtk_tree_view_column_pack_start (GtkTreeViewColumn *tree_column, @@ -1243,8 +1244,9 @@ gtk_tree_view_column_pack_start (GtkTreeViewColumn *tree_column, * @cell: The #GtkCellRenderer. * @expand: %TRUE if @cell is to be given extra space allocated to box. * - * Packs the @cell into the column. If @expand is %TRUE, then the @cell is - * allocated a share of all available space that the @tree_column has. + * Adds the @cell to end of the column. If @expand is FALSE, then the @cell + * is allocated no more space than it needs. Any unused space is divided + * evenly between cells for which @expand is TRUE. **/ void gtk_tree_view_column_pack_end (GtkTreeViewColumn *tree_column, @@ -2254,9 +2256,9 @@ gtk_tree_view_column_get_sort_order (GtkTreeViewColumn *tree_column) * @is_expander: %TRUE, if the row has children * @is_expanded: %TRUE, if the row has visible children * - * Sets the cell renderer based on the @tree_model and @tree_node. That is, for + * Sets the cell renderer based on the @tree_model and @iter. That is, for * every attribute mapping in @tree_column, it will get a value from the set - * column on the @tree_node, and use that value to set the attribute on the cell + * column on the @iter, and use that value to set the attribute on the cell * renderer. This is used primarily by the #GtkTreeView. **/ void