diff --git a/ChangeLog b/ChangeLog index cf08577264..8d3d1da015 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-04-23 Matthias Clasen + + * gtk/gtktextview.c (gtk_text_view_buffer_to_window_coords): + (gtk_text_view_window_to_buffer_coords): Improve docs. (#62359) + Tue Apr 23 18:35:34 2002 Kristian Rietveld This commit adds a cell_background property for cell renderers. With diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index cf08577264..8d3d1da015 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2002-04-23 Matthias Clasen + + * gtk/gtktextview.c (gtk_text_view_buffer_to_window_coords): + (gtk_text_view_window_to_buffer_coords): Improve docs. (#62359) + Tue Apr 23 18:35:34 2002 Kristian Rietveld This commit adds a cell_background property for cell renderers. With diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index cf08577264..8d3d1da015 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +2002-04-23 Matthias Clasen + + * gtk/gtktextview.c (gtk_text_view_buffer_to_window_coords): + (gtk_text_view_window_to_buffer_coords): Improve docs. (#62359) + Tue Apr 23 18:35:34 2002 Kristian Rietveld This commit adds a cell_background property for cell renderers. With diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index cf08577264..8d3d1da015 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2002-04-23 Matthias Clasen + + * gtk/gtktextview.c (gtk_text_view_buffer_to_window_coords): + (gtk_text_view_window_to_buffer_coords): Improve docs. (#62359) + Tue Apr 23 18:35:34 2002 Kristian Rietveld This commit adds a cell_background property for cell renderers. With diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index cf08577264..8d3d1da015 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2002-04-23 Matthias Clasen + + * gtk/gtktextview.c (gtk_text_view_buffer_to_window_coords): + (gtk_text_view_window_to_buffer_coords): Improve docs. (#62359) + Tue Apr 23 18:35:34 2002 Kristian Rietveld This commit adds a cell_background property for cell renderers. With diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index cf08577264..8d3d1da015 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2002-04-23 Matthias Clasen + + * gtk/gtktextview.c (gtk_text_view_buffer_to_window_coords): + (gtk_text_view_window_to_buffer_coords): Improve docs. (#62359) + Tue Apr 23 18:35:34 2002 Kristian Rietveld This commit adds a cell_background property for cell renderers. With diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index 6cead5e307..d67f9be36f 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,15 @@ +2002-04-24 Matthias Clasen + + * gdk-pixbuf/tmpl/gdk-pixbuf-loader.sgml: Updates. (#79001) + +2002-04-23 Matthias Clasen + + * gtk/tmpl/gtksocket.sgml: Add link to XEmbed draft. (#67818) + + * gtk/tmpl/gtkdrawingarea.sgml: Fix a typo. + + * gtk/text_widget.sgml: Complete the fix for #79080. + 2002-04-22 Matthias Clasen * gtk/tree_widget.sgml: Fix typo in "Simple Example". (#78661) diff --git a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-loader.sgml b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-loader.sgml index acdebe537c..dbdfa95c20 100644 --- a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-loader.sgml +++ b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-loader.sgml @@ -10,7 +10,8 @@ Application-driven progressive image loading. process of loading an image, by letting them send the image data directly to the loader instead of having the loader read the data from a file. Applications can use this functionality instead of - gdk_pixbuf_new_from_file() when they need to parse image data in + gdk_pixbuf_new_from_file() or gdk_pixbuf_animation_new_from_file() + when they need to parse image data in small chunks. For example, it should be used when reading an image from a (potentially) slow network connection, or when loading an extremely large file. @@ -47,31 +48,18 @@ Application-driven progressive image loading. Loading an animation - Loading an animation is a little more complex then loading an - image. In addition to the above signals, there is also a "frame_done" signal, - as well as an "animation_done" - signal. The first lets the application know that it is dealing - with an animation, instead of a static image. It also passes a - #GdkPixbufFrame in the signal. As before, if you want to keep - the frame, you need to ref it. Once the first "frame_done" signal + Loading an animation is almost as easy as loading an + image. Once the first "area_prepared" signal has been emitted, you can call gdk_pixbuf_loader_get_animation() - to get the #GdkPixbufAnimation struct. Each subsequent frame - goes through a similar lifecycle. For example "area_prepared" is - re-emitted. Then "area_updated" is - emitted as many times as necessary. Finally, "animation_done" - is emitted as soon as all frames are done. + to get the #GdkPixbufAnimation struct and gdk_pixbuf_animation_get_iter() + to get an #GdkPixbufAnimationIter for displaying it. - gdk_pixbuf_new_from_file() + gdk_pixbuf_new_from_file(), gdk_pixbuf_animation_new_from_file() diff --git a/docs/reference/gtk/text_widget.sgml b/docs/reference/gtk/text_widget.sgml index d703456d19..ca015bcd51 100644 --- a/docs/reference/gtk/text_widget.sgml +++ b/docs/reference/gtk/text_widget.sgml @@ -162,7 +162,7 @@ font and foreground color &mdash use standard functions such as gtk_widget_modify_font() or -gtk_widget_modify_fg(). +gtk_widget_modify_text(). For other attributes there are dedicated methods on GtkTextView such as gtk_text_view_set_tabs(). diff --git a/docs/reference/gtk/tmpl/gtkdrawingarea.sgml b/docs/reference/gtk/tmpl/gtkdrawingarea.sgml index 9757c2a863..653c27ccfa 100644 --- a/docs/reference/gtk/tmpl/gtkdrawingarea.sgml +++ b/docs/reference/gtk/tmpl/gtkdrawingarea.sgml @@ -53,7 +53,7 @@ that drawing is implicitly clipped to the exposed area. Simple <structname>GtkDrawingArea</structname> usage. gboolean -expose_event_callback (GdkWidget *widget, GdkEventExpose *event, gpointer data) +expose_event_callback (GtkWidget *widget, GdkEventExpose *event, gpointer data) { gdk_draw_arc (widget->window, widget->style->fg_gc[GTK_WIDGET_STATE (widget)], diff --git a/docs/reference/gtk/tmpl/gtksocket.sgml b/docs/reference/gtk/tmpl/gtksocket.sgml index 38e6fe9fd9..be5e1b19f1 100644 --- a/docs/reference/gtk/tmpl/gtksocket.sgml +++ b/docs/reference/gtk/tmpl/gtksocket.sgml @@ -62,12 +62,21 @@ to be destroyed at any time when the main event loop is running. + +The communication between a #GtkSocket and a #GtkPlug follows the +XEmbed +protocol. This protocol has also been implemented in other toolkits, e.g. +Qt, allowing the same level of integration +when embedding a Qt widget in GTK or vice versa. + A socket can also be used to swallow arbitrary pre-existing top-level windows using gtk_socket_steal(), though the integration when this is done will not be as close as between a #GtkPlug and a #GtkSocket. + + @@ -77,6 +86,11 @@ as between a #GtkPlug and a #GtkSocket. the widget that plugs into a #GtkSocket. + +XEmbed +the XEmbed Protocol Specification. + + diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c index 676f732b35..63a34e75fa 100644 --- a/gtk/gtktextview.c +++ b/gtk/gtktextview.c @@ -6845,14 +6845,17 @@ buffer_to_text_window (GtkTextView *text_view, /** * gtk_text_view_buffer_to_window_coords: * @text_view: a #GtkTextView - * @win: a #GtkTextWindowType + * @win: a #GtkTextWindowType except #GTK_TEXT_WINDOW_PRIVATE * @buffer_x: buffer x coordinate * @buffer_y: buffer y coordinate * @window_x: window x coordinate return location * @window_y: window y coordinate return location * * Converts coordinate (@buffer_x, @buffer_y) to coordinates for the window - * @win, and stores the result in (@window_x, @window_y). + * @win, and stores the result in (@window_x, @window_y). + * + * Note that you can't convert coordinates for a nonexisting window (see + * gtk_text_view_set_border_window_size()). **/ void gtk_text_view_buffer_to_window_coords (GtkTextView *text_view, @@ -6982,7 +6985,7 @@ text_window_to_buffer (GtkTextView *text_view, /** * gtk_text_view_window_to_buffer_coords: * @text_view: a #GtkTextView - * @win: a #GtkTextWindowType + * @win: a #GtkTextWindowType except #GTK_TEXT_WINDOW_PRIVATE * @window_x: window x coordinate * @window_y: window y coordinate * @buffer_x: buffer x coordinate return location @@ -6990,6 +6993,9 @@ text_window_to_buffer (GtkTextView *text_view, * * Converts coordinates on the window identified by @win to buffer * coordinates, storing the result in (@buffer_x,@buffer_y). + * + * Note that you can't convert coordinates for a nonexisting window (see + * gtk_text_view_set_border_window_size()). **/ void gtk_text_view_window_to_buffer_coords (GtkTextView *text_view,