diff options
author | Matthias Clasen <matthiasc@src.gnome.org> | 2001-11-29 23:08:38 +0000 |
---|---|---|
committer | Matthias Clasen <matthiasc@src.gnome.org> | 2001-11-29 23:08:38 +0000 |
commit | 24aef23aab128c58c901092cb793d9a69caf2a24 (patch) | |
tree | d0fe4ed359bc361f7bba719ecb2458ef1deafbb8 | |
parent | 209d0867e6369e75aa6b96ed229a0aaa6df91b64 (diff) | |
download | gdk-pixbuf-24aef23aab128c58c901092cb793d9a69caf2a24.tar.gz |
Typo fix.GTK_MULTIHEAD_MERGEPOINT_30_11_01
* gdk/gdkwindow.c: Typo fix.
* gtk/gtk-sections.sgml: Add GtkTextChildAnchor.
* gdk/tmpl/dnd.sgml: Updates.
* gdk/tmpl/pango_interaction.sgml: Document GdkPangoAttrEmbossed
and GdkPangoAttrStipple.
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | ChangeLog.pre-2-0 | 4 | ||||
-rw-r--r-- | ChangeLog.pre-2-10 | 4 | ||||
-rw-r--r-- | ChangeLog.pre-2-2 | 4 | ||||
-rw-r--r-- | ChangeLog.pre-2-4 | 4 | ||||
-rw-r--r-- | ChangeLog.pre-2-6 | 4 | ||||
-rw-r--r-- | ChangeLog.pre-2-8 | 4 | ||||
-rw-r--r-- | docs/reference/ChangeLog | 9 | ||||
-rw-r--r-- | docs/reference/gdk/tmpl/dnd.sgml | 43 | ||||
-rw-r--r-- | docs/reference/gdk/tmpl/pango_interaction.sgml | 15 | ||||
-rw-r--r-- | docs/reference/gtk/gtk-sections.txt | 11 | ||||
-rw-r--r-- | gdk/gdkwindow.c | 2 |
12 files changed, 81 insertions, 27 deletions
@@ -1,3 +1,7 @@ +2001-11-29 Matthias Clasen <matthiasc@poet.de> + + * gdk/gdkwindow.c: Typo fix. + Thu Nov 29 21:35:56 2001 Kristian Rietveld <kristian@planet.nl> * gtk/gtkmenu.c (gtk_menu_motion_notify): add checks for diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 9372aca56..e287d9284 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,7 @@ +2001-11-29 Matthias Clasen <matthiasc@poet.de> + + * gdk/gdkwindow.c: Typo fix. + Thu Nov 29 21:35:56 2001 Kristian Rietveld <kristian@planet.nl> * gtk/gtkmenu.c (gtk_menu_motion_notify): add checks for diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 9372aca56..e287d9284 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,7 @@ +2001-11-29 Matthias Clasen <matthiasc@poet.de> + + * gdk/gdkwindow.c: Typo fix. + Thu Nov 29 21:35:56 2001 Kristian Rietveld <kristian@planet.nl> * gtk/gtkmenu.c (gtk_menu_motion_notify): add checks for diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 9372aca56..e287d9284 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,7 @@ +2001-11-29 Matthias Clasen <matthiasc@poet.de> + + * gdk/gdkwindow.c: Typo fix. + Thu Nov 29 21:35:56 2001 Kristian Rietveld <kristian@planet.nl> * gtk/gtkmenu.c (gtk_menu_motion_notify): add checks for diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 9372aca56..e287d9284 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,7 @@ +2001-11-29 Matthias Clasen <matthiasc@poet.de> + + * gdk/gdkwindow.c: Typo fix. + Thu Nov 29 21:35:56 2001 Kristian Rietveld <kristian@planet.nl> * gtk/gtkmenu.c (gtk_menu_motion_notify): add checks for diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 9372aca56..e287d9284 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,7 @@ +2001-11-29 Matthias Clasen <matthiasc@poet.de> + + * gdk/gdkwindow.c: Typo fix. + Thu Nov 29 21:35:56 2001 Kristian Rietveld <kristian@planet.nl> * gtk/gtkmenu.c (gtk_menu_motion_notify): add checks for diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 9372aca56..e287d9284 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,7 @@ +2001-11-29 Matthias Clasen <matthiasc@poet.de> + + * gdk/gdkwindow.c: Typo fix. + Thu Nov 29 21:35:56 2001 Kristian Rietveld <kristian@planet.nl> * gtk/gtkmenu.c (gtk_menu_motion_notify): add checks for diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index 58d61370f..638676e0c 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,12 @@ +2001-11-29 Matthias Clasen <matthiasc@poet.de> + + * gtk/gtk-sections.sgml: Add GtkTextChildAnchor. + + * gdk/tmpl/dnd.sgml: Updates. + + * gdk/tmpl/pango_interaction.sgml: Document GdkPangoAttrEmbossed + and GdkPangoAttrStipple. + 2001-11-28 Matthias Clasen <matthiasc@poet.de> * gtk/tmpl/gtkwindow.sgml: Document gtk_window_position. diff --git a/docs/reference/gdk/tmpl/dnd.sgml b/docs/reference/gdk/tmpl/dnd.sgml index 066114ccd..c6545ceda 100644 --- a/docs/reference/gdk/tmpl/dnd.sgml +++ b/docs/reference/gdk/tmpl/dnd.sgml @@ -24,20 +24,20 @@ the GTK+ documentation for more information. <!-- ##### FUNCTION gdk_drag_get_selection ##### --> <para> - +Returns the selection atom for the current source window. </para> -@context: -@Returns: +@context: a #GdkDragContext. +@Returns: the selection atom. <!-- ##### FUNCTION gdk_drag_abort ##### --> <para> - +Aborts a drag without dropping. </para> -@context: -@time: +@context: a #GdkDragContext. +@time: the timestamp for this operation. <!-- ##### FUNCTION gdk_drop_reply ##### --> @@ -52,10 +52,10 @@ the GTK+ documentation for more information. <!-- ##### FUNCTION gdk_drag_context_new ##### --> <para> - +Creates a new #GdkDragContext. </para> -@Returns: +@Returns: the newly created #GdkDragContext. <!-- ##### FUNCTION gdk_drag_drop ##### --> @@ -82,20 +82,21 @@ the GTK+ documentation for more information. <!-- ##### FUNCTION gdk_drag_context_ref ##### --> <para> - +Increases the reference count of a drag context by one. </para> -@context: +@context: a #GdkDragContext. <!-- ##### FUNCTION gdk_drag_begin ##### --> <para> - +Creates a new drag context with @window as @source_window and @targets +as list of targets. </para> -@window: -@targets: -@Returns: +@window: the source window for this drag. +@targets: the list of targets. +@Returns: a newly created #GdkDragContext. <!-- ##### FUNCTION gdk_drag_motion ##### --> @@ -126,12 +127,14 @@ the GTK+ documentation for more information. <!-- ##### FUNCTION gdk_drag_get_protocol ##### --> <para> - +Finds out the DND protocol supported by a window. </para> -@xid: -@protocol: -@Returns: +@xid: the X id of the destination window. +@protocol: location where the supported DND protocol is returned. +@Returns: the X id of the window where the drop should happen. This + may be @xid or the X id of a proxy window, or None if @xid doesn't + support Drag and Drop. <!-- ##### ENUM GdkDragProtocol ##### --> @@ -151,10 +154,10 @@ which DND is done. <!-- ##### FUNCTION gdk_drag_context_unref ##### --> <para> - +Decreases the reference count of a drag context by one. </para> -@context: +@context: a #GdkDragContext. <!-- ##### STRUCT GdkDragContext ##### --> diff --git a/docs/reference/gdk/tmpl/pango_interaction.sgml b/docs/reference/gdk/tmpl/pango_interaction.sgml index 8ecda464a..48d6d65d9 100644 --- a/docs/reference/gdk/tmpl/pango_interaction.sgml +++ b/docs/reference/gdk/tmpl/pango_interaction.sgml @@ -33,19 +33,22 @@ Pango Interaction <!-- ##### STRUCT GdkPangoAttrEmbossed ##### --> <para> - +A Pango text attribute containing a embossed bitmap to be used when +rendering the text. </para> -@attr: -@embossed: +@attr: the #PangoAttribute. +@embossed: the embossed bitmap. + <!-- ##### STRUCT GdkPangoAttrStipple ##### --> <para> - +A Pango text attribute containing a stipple bitmap to be used when +rendering the text. </para> -@attr: -@stipple: +@attr: the #PangoAttribute. +@stipple: the stipple bitmap. <!-- ##### FUNCTION gdk_pango_attr_embossed_new ##### --> <para> diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt index f17a0165a..203fcb7e9 100644 --- a/docs/reference/gtk/gtk-sections.txt +++ b/docs/reference/gtk/gtk-sections.txt @@ -2573,6 +2573,10 @@ gtk_text_view_backward_display_line_start gtk_text_view_starts_display_line gtk_text_view_move_visually gtk_text_view_add_child_at_anchor +GtkTextChildAnchor +gtk_text_child_anchor_new +gtk_text_child_anchor_get_widgets +gtk_text_child_anchor_get_deleted gtk_text_view_add_child_in_window gtk_text_view_move_child gtk_text_view_set_wrap_mode @@ -2606,8 +2610,15 @@ GTK_TYPE_TEXT_VIEW GTK_TEXT_VIEW_CLASS GTK_IS_TEXT_VIEW_CLASS GTK_TEXT_VIEW_GET_CLASS +GTK_TEXT_CHILD_ANCHOR +GTK_IS_TEXT_CHILD_ANCHOR +GTK_TYPE_TEXT_CHILD_ANCHOR +GTK_TEXT_CHILD_ANCHOR_CLASS +GTK_IS_TEXT_CHILD_ANCHOR_CLASS +GTK_TEXT_CHILD_ANCHOR_GET_CLASS <SUBSECTION Private> gtk_text_view_get_type +gtk_text_child_anchor_get_type GtkTextBTree GtkTextChildBody GtkTextPixbuf diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c index e16616514..7a871ed6c 100644 --- a/gdk/gdkwindow.c +++ b/gdk/gdkwindow.c @@ -2572,7 +2572,7 @@ gdk_window_constrain_size (GdkGeometry *geometry, /** * gdk_set_pointer_hooks: - * @new_hooks: a table of pointer to functions for getting + * @new_hooks: a table of pointers to functions for getting * quantities related to the current pointer position, * or %NULL to restore the default table. * |