diff --git a/ChangeLog b/ChangeLog index 622d7ca640..8b49db3aed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2002-04-24 Matthias Clasen + + Merged from HEAD: + + * gtk/gtktextiter.c: + * gtk/gtktreemodelsort.c: + * gtk/gtktextview.c: Documentation fixes. (#62359, #68404, #57929) + 2002-04-22 Anders Carlsson * gtk/gtkentry.c (gtk_entry_drag_data_get): Use diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 622d7ca640..8b49db3aed 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +2002-04-24 Matthias Clasen + + Merged from HEAD: + + * gtk/gtktextiter.c: + * gtk/gtktreemodelsort.c: + * gtk/gtktextview.c: Documentation fixes. (#62359, #68404, #57929) + 2002-04-22 Anders Carlsson * gtk/gtkentry.c (gtk_entry_drag_data_get): Use diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 622d7ca640..8b49db3aed 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +2002-04-24 Matthias Clasen + + Merged from HEAD: + + * gtk/gtktextiter.c: + * gtk/gtktreemodelsort.c: + * gtk/gtktextview.c: Documentation fixes. (#62359, #68404, #57929) + 2002-04-22 Anders Carlsson * gtk/gtkentry.c (gtk_entry_drag_data_get): Use diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 622d7ca640..8b49db3aed 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +2002-04-24 Matthias Clasen + + Merged from HEAD: + + * gtk/gtktextiter.c: + * gtk/gtktreemodelsort.c: + * gtk/gtktextview.c: Documentation fixes. (#62359, #68404, #57929) + 2002-04-22 Anders Carlsson * gtk/gtkentry.c (gtk_entry_drag_data_get): Use diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 622d7ca640..8b49db3aed 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +2002-04-24 Matthias Clasen + + Merged from HEAD: + + * gtk/gtktextiter.c: + * gtk/gtktreemodelsort.c: + * gtk/gtktextview.c: Documentation fixes. (#62359, #68404, #57929) + 2002-04-22 Anders Carlsson * gtk/gtkentry.c (gtk_entry_drag_data_get): Use diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 622d7ca640..8b49db3aed 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +2002-04-24 Matthias Clasen + + Merged from HEAD: + + * gtk/gtktextiter.c: + * gtk/gtktreemodelsort.c: + * gtk/gtktextview.c: Documentation fixes. (#62359, #68404, #57929) + 2002-04-22 Anders Carlsson * gtk/gtkentry.c (gtk_entry_drag_data_get): Use diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index 033e149639..1d93044455 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,20 @@ +2002-04-24 Matthias Clasen + + Merged from HEAD: + + * gtk/tmpl/gtksocket.sgml: + * gtk/tmpl/gtkdrawingarea.sgml: + * gtk/tmpl/gtktreemodel.sgml: + * gtk/tmpl/gtkradiomenuitem.sgml: + * gtk/tmpl/gtkwidget.sgml: + * gtk/tmpl/gtkdialog.sgml: + * gdk-pixbuf/tmpl/gdk-pixbuf-loader.sgml: + * gtk/text_widget.sgml: + * gtk/tree_widget.sgml: + * gtk/gtk-sections.txt: + * gdk/tmpl/properties.sgml: Documentation fixes. (#79001, #67818, + #79080, #78661, #78392, #75588, #72312, #74439) + Tue Mar 26 15:41:49 2002 Owen Taylor * gtk/building.sgml: Add a mention of running ldconfig. 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/gdk/tmpl/properties.sgml b/docs/reference/gdk/tmpl/properties.sgml index 292ae857e7..3c4c8d3fd9 100644 --- a/docs/reference/gdk/tmpl/properties.sgml +++ b/docs/reference/gdk/tmpl/properties.sgml @@ -244,10 +244,10 @@ Changes the contents of a property on a window. @window: a #GdkWindow. @property: the property to change. @type: the new type for the property. If @mode is - %GDK_PROP_MODE_REPLACE or %GDK_PROP_MODE_APPEND, then this + %GDK_PROP_MODE_PREPEND or %GDK_PROP_MODE_APPEND, then this must match the existing type or an error will occur. @format: the new format for the property. If @mode is - %GDK_PROP_MODE_REPLACE or %GDK_PROP_MODE_APPEND, then this + %GDK_PROP_MODE_PREPEND or %GDK_PROP_MODE_APPEND, then this must match the existing format or an error will occur. @mode: a value describing how the new data is to be combined with the current data. diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt index b7b6460478..a84346053c 100644 --- a/docs/reference/gtk/gtk-sections.txt +++ b/docs/reference/gtk/gtk-sections.txt @@ -3447,6 +3447,7 @@ gtk_vseparator_get_type gtkwidget GtkWidget GtkWidget +GtkWidgetClass GtkWidgetFlags GTK_WIDGET_TYPE GTK_WIDGET_STATE diff --git a/docs/reference/gtk/text_widget.sgml b/docs/reference/gtk/text_widget.sgml index 144a3bbe57..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(). @@ -170,6 +170,7 @@ For other attributes there are dedicated methods on GtkWidget *view; GtkTextBuffer *buffer; + GtkTextIter start, end; PangoFontDescription *font_desc; GdkColor color; GtkTextTag *tag; @@ -187,7 +188,7 @@ For other attributes there are dedicated methods on /* Change default color throughout the widget */ gdk_color_parse ("green", &color); - gtk_widget_modify_fg (view, GTK_STATE_NORMAL, &color); + gtk_widget_modify_text (view, GTK_STATE_NORMAL, &color); /* Change left margin throughout the widget */ gtk_text_view_set_left_margin (GTK_TEXT_VIEW (view), 30); diff --git a/docs/reference/gtk/tmpl/gtkdialog.sgml b/docs/reference/gtk/tmpl/gtkdialog.sgml index b9a1013be4..764e64868a 100644 --- a/docs/reference/gtk/tmpl/gtkdialog.sgml +++ b/docs/reference/gtk/tmpl/gtkdialog.sgml @@ -82,7 +82,7 @@ void quick_message (gchar *message) { dialog = gtk_dialog_new_with_buttons ("Message", main_application_window, GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_STOCK_BUTTON_OK, + GTK_STOCK_OK, GTK_RESPONSE_NONE, NULL); label = gtk_label_new (message); diff --git a/docs/reference/gtk/tmpl/gtkdrawingarea.sgml b/docs/reference/gtk/tmpl/gtkdrawingarea.sgml index 9b686dd64a..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)], @@ -64,7 +64,7 @@ expose_event_callback (GdkWidget *widget, GdkEventExpose *event, gpointer data) return TRUE; } [...] - GtkWidget *drawing_area = gtk_drawing_area_new (); + GtkWidget *drawing_area = gtk_drawing_area_new (); gtk_widget_set_size_request (drawing_area, 100, 100); g_signal_connect (G_OBJECT (drawing_area), "expose_event", G_CALLBACK (expose_event_callback), NULL); diff --git a/docs/reference/gtk/tmpl/gtkradiomenuitem.sgml b/docs/reference/gtk/tmpl/gtkradiomenuitem.sgml index 9b8d10b3a6..9d5781d747 100644 --- a/docs/reference/gtk/tmpl/gtkradiomenuitem.sgml +++ b/docs/reference/gtk/tmpl/gtkradiomenuitem.sgml @@ -38,7 +38,7 @@ for(i = 0; i < 5; i++) because a radio menu item is a menu item. -#GtkCheckItem +#GtkCheckMenuItem to know how to handle the check. diff --git a/docs/reference/gtk/tmpl/gtksocket.sgml b/docs/reference/gtk/tmpl/gtksocket.sgml index 579105672d..1b406a8b09 100644 --- a/docs/reference/gtk/tmpl/gtksocket.sgml +++ b/docs/reference/gtk/tmpl/gtksocket.sgml @@ -25,7 +25,7 @@ have been added to its parent. Obtaining the window ID of a socket. -GtkWidget *socket = gtk_socket_new (); +GtkWidget *socket = gtk_socket_new (); gtk_widget_show (socket); gtk_container_add (GTK_CONTAINER (parent), socket); @@ -62,6 +62,13 @@ 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(), @@ -77,6 +84,11 @@ as between a #GtkPlug and a #GtkSocket. the widget that plugs into a #GtkSocket. + +XEmbed +the XEmbed Protocol Specification. + + diff --git a/docs/reference/gtk/tmpl/gtktreemodel.sgml b/docs/reference/gtk/tmpl/gtktreemodel.sgml index 9c60f905f5..ebc39533cf 100644 --- a/docs/reference/gtk/tmpl/gtktreemodel.sgml +++ b/docs/reference/gtk/tmpl/gtktreemodel.sgml @@ -168,7 +168,7 @@ enum gchar *str_data; gint int_data; - /* Make sure you terminate calls to gtk_tree_model_get() + /* Make sure you terminate calls to gtk_tree_model_get() * with a '-1' value */ gtk_tree_model_get (list_store, &iter, @@ -190,7 +190,7 @@ enum -#GtkTreeView, #GtkTreeStore, #GtkListStore, #GtkTreeDnd, #GtkTreeSortable +#GtkTreeView, #GtkTreeStore, #GtkListStore, GtkTreeDnd, #GtkTreeSortable diff --git a/docs/reference/gtk/tmpl/gtkwidget.sgml b/docs/reference/gtk/tmpl/gtkwidget.sgml index 69ced7b704..294f4183e9 100644 --- a/docs/reference/gtk/tmpl/gtkwidget.sgml +++ b/docs/reference/gtk/tmpl/gtkwidget.sgml @@ -20,14 +20,20 @@ GtkWidget + + + + + + Tells about certain properties of the widget. @GTK_TOPLEVEL: - widgets without a real parent, as there are #GtkWindows and - #GtkMenus have this flag set throughout their lifetime. + widgets without a real parent, as there are #GtkWindows and + #GtkMenus have this flag set throughout their lifetime. Toplevel widgets always contain their own #GdkWindow. @GTK_NO_WINDOW: Indicative for a widget that does not provide its own #GdkWindow. @@ -929,7 +935,12 @@ Equivalent to gtk_widget_set_style (widget, NULL). -Calls gtk_widget_set_rc_style() recursively on all descendants. +Reset the styles of @widget and all descendents, so when +they are looked up again, they get the correct values +for the currently loaded RC file settings. + + +This function is not useful for applications. @widget: a #GtkWidget. diff --git a/docs/reference/gtk/tree_widget.sgml b/docs/reference/gtk/tree_widget.sgml index 3e33dd50b6..47e351326b 100644 --- a/docs/reference/gtk/tree_widget.sgml +++ b/docs/reference/gtk/tree_widget.sgml @@ -287,7 +287,7 @@ setup_tree (void) populate_tree_model (store); /* Create a view */ - view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store)); + tree = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store)); /* The view now holds a reference. We can get rid of our own * reference */ diff --git a/gtk/gtktextiter.c b/gtk/gtktextiter.c index bb30ed0bbb..4d980b7c32 100644 --- a/gtk/gtktextiter.c +++ b/gtk/gtktextiter.c @@ -4322,8 +4322,9 @@ strbreakup (const char *string, * @match_end: return location for end of match, or %NULL * @limit: bound for the search, or %NULL for the end of the buffer * - * Searches forward for @str. Any match is returned as the range - * @match_start, @match_end. The search will not continue past + * Searches forward for @str. Any match is returned by setting + * @match_start to the first character of the match and @match_end to the + * first character after the match. The search will not continue past * @limit. Note that a search is a linear or O(n) operation, so you * may wish to use @limit to avoid locking up your UI on large * buffers. diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c index 676f732b35..f461077392 100644 --- a/gtk/gtktextview.c +++ b/gtk/gtktextview.c @@ -6845,7 +6845,7 @@ 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 @@ -6853,6 +6853,9 @@ buffer_to_text_window (GtkTextView *text_view, * * Converts coordinate (@buffer_x, @buffer_y) to coordinates for the window * @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, diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c index fb6aee381e..99ba15aec0 100644 --- a/gtk/gtktreemodelsort.c +++ b/gtk/gtktreemodelsort.c @@ -1937,9 +1937,10 @@ gtk_tree_model_sort_convert_child_iter_to_iter (GtkTreeModelSort *tree_model_sor * @tree_model_sort: A #GtkTreeModelSort * @sorted_path: A #GtkTreePath to convert * - * Converts @sort_path to a path on the child model of @tree_model_sort. That - * is, @sort_path points ot a location in @tree_model_sort. The returned path - * will point to the same location in the model not being sorted. If @path does not point to a + * Converts @sorted_path to a path on the child model of @tree_model_sort. That + * is, @sorted_path points to a location in @tree_model_sort. The returned path + * will point to the same location in the model not being sorted. If @sorted_path + * does not point to a location in the child model, %NULL is returned. * * Return value: A newly allocated #GtkTreePath, or %NULL **/