From: Jonathan Blandford Date: Thu, 27 Sep 2001 00:09:41 +0000 (+0000) Subject: Stop being stupid and emitting the signal every time. X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=4b6bc02f66ee3e9def305a3c1c77a3fec1b37b45;p=~andy%2Fgtk Stop being stupid and emitting the signal every time. Wed Sep 26 19:48:01 2001 Jonathan Blandford * gtk/gtktreestore.c (gtk_tree_store_set_valist): Stop being stupid and emitting the signal every time. * gtk/gtkliststore.c (gtk_list_store_set_valist): ditto --- diff --git a/ChangeLog b/ChangeLog index 67697dc73..b25e7a5f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Wed Sep 26 19:48:01 2001 Jonathan Blandford + + * gtk/gtktreestore.c (gtk_tree_store_set_valist): Stop being + stupid and emitting the signal every time. + + * gtk/gtkliststore.c (gtk_list_store_set_valist): ditto + Wed Sep 26 16:35:59 2001 Owen Taylor Patch from Mark McLoughlin (#61233) @@ -16,7 +23,7 @@ Wed Sep 26 16:15:25 2001 Owen Taylor * gtk/gtkentry.c (paste_received): Patch from Damian Ivereigh to replace selection if there is one. (#61121) - + 2001-09-25 Darin Adler * tests/.cvsignore: Ignore new test program. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 67697dc73..b25e7a5f4 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,10 @@ +Wed Sep 26 19:48:01 2001 Jonathan Blandford + + * gtk/gtktreestore.c (gtk_tree_store_set_valist): Stop being + stupid and emitting the signal every time. + + * gtk/gtkliststore.c (gtk_list_store_set_valist): ditto + Wed Sep 26 16:35:59 2001 Owen Taylor Patch from Mark McLoughlin (#61233) @@ -16,7 +23,7 @@ Wed Sep 26 16:15:25 2001 Owen Taylor * gtk/gtkentry.c (paste_received): Patch from Damian Ivereigh to replace selection if there is one. (#61121) - + 2001-09-25 Darin Adler * tests/.cvsignore: Ignore new test program. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 67697dc73..b25e7a5f4 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Wed Sep 26 19:48:01 2001 Jonathan Blandford + + * gtk/gtktreestore.c (gtk_tree_store_set_valist): Stop being + stupid and emitting the signal every time. + + * gtk/gtkliststore.c (gtk_list_store_set_valist): ditto + Wed Sep 26 16:35:59 2001 Owen Taylor Patch from Mark McLoughlin (#61233) @@ -16,7 +23,7 @@ Wed Sep 26 16:15:25 2001 Owen Taylor * gtk/gtkentry.c (paste_received): Patch from Damian Ivereigh to replace selection if there is one. (#61121) - + 2001-09-25 Darin Adler * tests/.cvsignore: Ignore new test program. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 67697dc73..b25e7a5f4 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +Wed Sep 26 19:48:01 2001 Jonathan Blandford + + * gtk/gtktreestore.c (gtk_tree_store_set_valist): Stop being + stupid and emitting the signal every time. + + * gtk/gtkliststore.c (gtk_list_store_set_valist): ditto + Wed Sep 26 16:35:59 2001 Owen Taylor Patch from Mark McLoughlin (#61233) @@ -16,7 +23,7 @@ Wed Sep 26 16:15:25 2001 Owen Taylor * gtk/gtkentry.c (paste_received): Patch from Damian Ivereigh to replace selection if there is one. (#61121) - + 2001-09-25 Darin Adler * tests/.cvsignore: Ignore new test program. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 67697dc73..b25e7a5f4 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +Wed Sep 26 19:48:01 2001 Jonathan Blandford + + * gtk/gtktreestore.c (gtk_tree_store_set_valist): Stop being + stupid and emitting the signal every time. + + * gtk/gtkliststore.c (gtk_list_store_set_valist): ditto + Wed Sep 26 16:35:59 2001 Owen Taylor Patch from Mark McLoughlin (#61233) @@ -16,7 +23,7 @@ Wed Sep 26 16:15:25 2001 Owen Taylor * gtk/gtkentry.c (paste_received): Patch from Damian Ivereigh to replace selection if there is one. (#61121) - + 2001-09-25 Darin Adler * tests/.cvsignore: Ignore new test program. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 67697dc73..b25e7a5f4 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Wed Sep 26 19:48:01 2001 Jonathan Blandford + + * gtk/gtktreestore.c (gtk_tree_store_set_valist): Stop being + stupid and emitting the signal every time. + + * gtk/gtkliststore.c (gtk_list_store_set_valist): ditto + Wed Sep 26 16:35:59 2001 Owen Taylor Patch from Mark McLoughlin (#61233) @@ -16,7 +23,7 @@ Wed Sep 26 16:15:25 2001 Owen Taylor * gtk/gtkentry.c (paste_received): Patch from Damian Ivereigh to replace selection if there is one. (#61121) - + 2001-09-25 Darin Adler * tests/.cvsignore: Ignore new test program. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 67697dc73..b25e7a5f4 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Wed Sep 26 19:48:01 2001 Jonathan Blandford + + * gtk/gtktreestore.c (gtk_tree_store_set_valist): Stop being + stupid and emitting the signal every time. + + * gtk/gtkliststore.c (gtk_list_store_set_valist): ditto + Wed Sep 26 16:35:59 2001 Owen Taylor Patch from Mark McLoughlin (#61233) @@ -16,7 +23,7 @@ Wed Sep 26 16:15:25 2001 Owen Taylor * gtk/gtkentry.c (paste_received): Patch from Damian Ivereigh to replace selection if there is one. (#61121) - + 2001-09-25 Darin Adler * tests/.cvsignore: Ignore new test program. diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index aeeb5e2d8..c406aa586 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,7 @@ +Wed Sep 26 15:05:28 2001 Jonathan Blandford + + * gtk/gtk.types: Add missing types. + Mon Sep 24 12:43:45 2001 Owen Taylor * gtk/gtk-sections.txt: Updates for removed/renamed functions. diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt index becf514e7..c157e6581 100644 --- a/docs/reference/gtk/gtk-sections.txt +++ b/docs/reference/gtk/gtk-sections.txt @@ -2687,8 +2687,10 @@ GTK_IS_TREE_SELECTION_CLASS GtkTreeStore GtkTreeStore gtk_tree_store_new +gtk_tree_store_newv gtk_tree_store_set_value gtk_tree_store_set +gtk_tree_store_set_valist gtk_tree_store_remove gtk_tree_store_insert gtk_tree_store_insert_before @@ -2697,6 +2699,7 @@ gtk_tree_store_prepend gtk_tree_store_append gtk_tree_store_is_ancestor gtk_tree_store_iter_depth +gtk_tree_store_clear GTK_TREE_STORE GTK_IS_TREE_STORE @@ -2704,6 +2707,7 @@ GTK_TYPE_TREE_STORE gtk_tree_store_get_type GTK_TREE_STORE_CLASS GTK_IS_TREE_STORE_CLASS +GTK_TREE_STORE_GET_CLASS
@@ -2714,7 +2718,6 @@ GtkTreeViewColumnSizing GtkTreeViewColumn gtk_tree_view_column_new gtk_tree_view_column_new_with_attributes -gtk_tree_view_column_set_cell_renderer gtk_tree_view_column_add_attribute gtk_tree_view_column_set_attributes gtk_tree_view_column_set_visible @@ -2744,10 +2747,16 @@ GTK_IS_TREE_VIEW_COLUMN_CLASS
gtktreeview -GtkTreeView +GtkTreeViewDropPosition +GtkTreeViewPrivate GtkTreeSelection GtkTreeSelectionClass GtkTreeView +GtkTreeViewColumnDropFunc +GtkTreeViewDraggableFunc +GtkTreeViewMappingFunc +GtkTreeViewDroppableFunc +GtkTreeViewSearchEqualFunc gtk_tree_view_new gtk_tree_view_new_with_model gtk_tree_view_get_model @@ -2761,16 +2770,53 @@ gtk_tree_view_get_headers_visible gtk_tree_view_set_headers_visible gtk_tree_view_columns_autosize gtk_tree_view_set_headers_clickable +gtk_tree_view_set_rules_hint +gtk_tree_view_get_rules_hint gtk_tree_view_append_column gtk_tree_view_remove_column gtk_tree_view_insert_column +gtk_tree_view_insert_column_with_attributes +gtk_tree_view_insert_column_with_data_func gtk_tree_view_get_column +gtk_tree_view_get_columns +gtk_tree_view_move_column_after +gtk_tree_view_set_expander_column +gtk_tree_view_get_expander_column +gtk_tree_view_set_column_drag_function +gtk_tree_view_scroll_to_point gtk_tree_view_scroll_to_cell -gtk_tree_view_get_path_at_pos +gtk_tree_view_row_activated gtk_tree_view_expand_all gtk_tree_view_collapse_all gtk_tree_view_expand_row gtk_tree_view_collapse_row +gtk_tree_view_map_expanded_rows +gtk_tree_view_row_expanded +gtk_tree_view_set_reorderable +gtk_tree_view_get_reorderable +gtk_tree_view_set_cursor +gtk_tree_view_get_path_at_pos +gtk_tree_view_get_cell_area +gtk_tree_view_get_background_area +gtk_tree_view_get_visible_rect +gtk_tree_view_widget_to_tree_coords +gtk_tree_view_tree_to_widget_coords +gtk_tree_view_set_rows_drag_source +gtk_tree_view_set_rows_drag_dest +gtk_tree_view_unset_rows_drag_source +gtk_tree_view_unset_rows_drag_dest +gtk_tree_view_set_drag_dest_row +gtk_tree_view_get_drag_dest_row +gtk_tree_view_get_dest_row_at_pos +gtk_tree_view_create_row_drag_icon +gtk_tree_view_set_enable_search +gtk_tree_view_get_enable_search +gtk_tree_view_get_search_column +gtk_tree_view_set_search_column +gtk_tree_view_get_search_equal_func +gtk_tree_view_set_search_equal_func +GtkTreeDestroyCountFunc +gtk_tree_view_set_destroy_count_func GTK_TREE_VIEW GTK_IS_TREE_VIEW @@ -2778,8 +2824,7 @@ GTK_TYPE_TREE_VIEW gtk_tree_view_get_type GTK_TREE_VIEW_CLASS GTK_IS_TREE_VIEW_CLASS - -GtkTreeViewPrivate +GTK_TREE_VIEW_GET_CLASS
@@ -2802,10 +2847,15 @@ GTK_TREE_DRAG_SOURCE_GET_IFACE
gtkcellrenderer GtkCellRendererState +GtkCellRendererMode GtkCellRenderer GtkCellRenderer gtk_cell_renderer_get_size gtk_cell_renderer_render +gtk_cell_renderer_activate +gtk_cell_renderer_start_editing +gtk_cell_renderer_get_fixed_size +gtk_cell_renderer_set_fixed_size GTK_CELL_RENDERER GTK_IS_CELL_RENDERER diff --git a/docs/reference/gtk/gtk.types b/docs/reference/gtk/gtk.types index e13ae7b72..ba5a3574d 100644 --- a/docs/reference/gtk/gtk.types +++ b/docs/reference/gtk/gtk.types @@ -1,32 +1,40 @@ #include +gtk_accel_group_get_type gtk_accel_label_get_type +gtk_accessible_get_type gtk_adjustment_get_type gtk_alignment_get_type gtk_arrow_get_type gtk_aspect_frame_get_type gtk_bin_get_type gtk_box_get_type -gtk_button_get_type gtk_button_box_get_type +gtk_button_get_type gtk_calendar_get_type +gtk_cell_editable_get_type +gtk_cell_renderer_get_type +gtk_cell_renderer_pixbuf_get_type +gtk_cell_renderer_text_get_type +gtk_cell_renderer_toggle_get_type gtk_check_button_get_type gtk_check_menu_item_get_type gtk_clist_get_type -gtk_color_selection_get_type gtk_color_selection_dialog_get_type +gtk_color_selection_get_type gtk_combo_get_type gtk_container_get_type gtk_ctree_get_type gtk_curve_get_type gtk_dialog_get_type gtk_drawing_area_get_type +gtk_editable_get_type gtk_entry_get_type gtk_event_box_get_type gtk_file_selection_get_type gtk_fixed_get_type -gtk_font_selection_get_type gtk_font_selection_dialog_get_type +gtk_font_selection_get_type gtk_frame_get_type gtk_gamma_curve_get_type gtk_handle_box_get_type @@ -37,49 +45,60 @@ gtk_hruler_get_type gtk_hscale_get_type gtk_hscrollbar_get_type gtk_hseparator_get_type -gtk_image_get_type +gtk_icon_factory_get_type gtk_im_context_get_type +gtk_im_context_simple_get_type gtk_im_multicontext_get_type +gtk_image_get_type +gtk_image_menu_item_get_type gtk_input_dialog_get_type gtk_invisible_get_type -gtk_item_get_type gtk_item_factory_get_type +gtk_item_get_type gtk_label_get_type gtk_layout_get_type gtk_list_get_type gtk_list_item_get_type -gtk_menu_get_type +gtk_list_store_get_type gtk_menu_bar_get_type +gtk_menu_get_type gtk_menu_item_get_type gtk_menu_shell_get_type gtk_message_dialog_get_type gtk_misc_get_type gtk_notebook_get_type -gtk_old_editable_get_type gtk_object_get_type +gtk_old_editable_get_type gtk_option_menu_get_type gtk_paned_get_type gtk_pixmap_get_type gtk_plug_get_type gtk_preview_get_type -gtk_progress_get_type gtk_progress_bar_get_type +gtk_progress_get_type gtk_radio_button_get_type gtk_radio_menu_item_get_type gtk_range_get_type +gtk_rc_style_get_type gtk_ruler_get_type gtk_scale_get_type gtk_scrollbar_get_type gtk_scrolled_window_get_type gtk_separator_get_type +gtk_separator_menu_item_get_type +gtk_settings_get_type gtk_size_group_get_type gtk_socket_get_type gtk_spin_button_get_type gtk_statusbar_get_type +gtk_style_get_type gtk_table_get_type gtk_tearoff_menu_item_get_type -gtk_text_get_type gtk_text_buffer_get_type +gtk_text_child_anchor_get_type +gtk_text_get_type +gtk_text_layout_get_type +gtk_text_mark_get_type gtk_text_tag_get_type gtk_text_tag_table_get_type gtk_text_view_get_type @@ -87,8 +106,17 @@ gtk_tips_query_get_type gtk_toggle_button_get_type gtk_toolbar_get_type gtk_tooltips_get_type +gtk_tree_drag_dest_get_type +gtk_tree_drag_source_get_type gtk_tree_get_type gtk_tree_item_get_type +gtk_tree_model_get_type +gtk_tree_model_sort_get_type +gtk_tree_selection_get_type +gtk_tree_sortable_get_type +gtk_tree_store_get_type +gtk_tree_view_column_get_type +gtk_tree_view_get_type gtk_vbox_get_type gtk_vbutton_box_get_type gtk_viewport_get_type @@ -99,3 +127,4 @@ gtk_vscrollbar_get_type gtk_vseparator_get_type gtk_widget_get_type gtk_window_get_type +gtk_window_group_get_type diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml index 05a643ba9..6597d9a17 100644 --- a/docs/reference/gtk/tmpl/gtk-unused.sgml +++ b/docs/reference/gtk/tmpl/gtk-unused.sgml @@ -1003,6 +1003,14 @@ produce superscript and subscript. @GTK_TREE_SELECTION_SINGLE: @GTK_TREE_SELECTION_MULTI: + + + + + +@parent: +@priv: + the #GtkAdjustment which sets the range of the scale. diff --git a/docs/reference/gtk/tmpl/gtkcellrenderer.sgml b/docs/reference/gtk/tmpl/gtkcellrenderer.sgml index fdf8185a3..cb2c8766b 100644 --- a/docs/reference/gtk/tmpl/gtkcellrenderer.sgml +++ b/docs/reference/gtk/tmpl/gtkcellrenderer.sgml @@ -24,22 +24,20 @@ GtkCellRenderer @GTK_CELL_RENDERER_INSENSITIVE: @GTK_CELL_RENDERER_SORTED: + + + + + +@GTK_CELL_RENDERER_MODE_INERT: +@GTK_CELL_RENDERER_MODE_ACTIVATABLE: +@GTK_CELL_RENDERER_MODE_EDITABLE: + -@parent: -@xalign: -@yalign: -@width: -@height: -@xpad: -@ypad: -@mode: -@visible: -@is_expander: -@is_expanded: @@ -69,3 +67,103 @@ GtkCellRenderer @flags: + + + + + +@cell: +@event: +@widget: +@path: +@background_area: +@cell_area: +@flags: +@Returns: + + + + + + + +@cell: +@event: +@widget: +@path: +@background_area: +@cell_area: +@flags: +@Returns: + + + + + + + +@cell: +@width: +@height: + + + + + + + +@cell: +@width: +@height: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkcellrendererpixbuf.sgml b/docs/reference/gtk/tmpl/gtkcellrendererpixbuf.sgml index b407d28e0..ec675c422 100644 --- a/docs/reference/gtk/tmpl/gtkcellrendererpixbuf.sgml +++ b/docs/reference/gtk/tmpl/gtkcellrendererpixbuf.sgml @@ -19,10 +19,6 @@ GtkCellRendererPixbuf -@parent: -@pixbuf: -@pixbuf_expander_open: -@pixbuf_expander_closed: @@ -32,3 +28,8 @@ GtkCellRendererPixbuf @Returns: + + + + + diff --git a/docs/reference/gtk/tmpl/gtkcellrenderertext.sgml b/docs/reference/gtk/tmpl/gtkcellrenderertext.sgml index 8016b4787..3d11bd8bc 100644 --- a/docs/reference/gtk/tmpl/gtkcellrenderertext.sgml +++ b/docs/reference/gtk/tmpl/gtkcellrenderertext.sgml @@ -19,7 +19,6 @@ GtkCellRendererText -@parent: @@ -29,3 +28,182 @@ GtkCellRendererText @Returns: + + + + + +@cellrenderertext: the object which received the signal. +@arg1: +@arg2: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkcellrenderertoggle.sgml b/docs/reference/gtk/tmpl/gtkcellrenderertoggle.sgml index ae99e4d4a..81eb22d9e 100644 --- a/docs/reference/gtk/tmpl/gtkcellrenderertoggle.sgml +++ b/docs/reference/gtk/tmpl/gtkcellrenderertoggle.sgml @@ -19,7 +19,6 @@ GtkCellRendererToggle -@parent: @@ -56,3 +55,26 @@ GtkCellRendererToggle @setting: + + + + + +@cellrenderertoggle: the object which received the signal. +@arg1: + + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkiconfactory.sgml b/docs/reference/gtk/tmpl/gtkiconfactory.sgml index 18374d917..6e2c8ec12 100644 --- a/docs/reference/gtk/tmpl/gtkiconfactory.sgml +++ b/docs/reference/gtk/tmpl/gtkiconfactory.sgml @@ -43,8 +43,6 @@ looking up the icon to use for a given stock ID. -@parent_instance: -@icons: diff --git a/docs/reference/gtk/tmpl/gtkimagemenuitem.sgml b/docs/reference/gtk/tmpl/gtkimagemenuitem.sgml index 08ae2479a..4b5782499 100644 --- a/docs/reference/gtk/tmpl/gtkimagemenuitem.sgml +++ b/docs/reference/gtk/tmpl/gtkimagemenuitem.sgml @@ -19,7 +19,6 @@ GtkImageMenuItem -@menu_item: @@ -84,3 +83,8 @@ GtkImageMenuItem @Returns: + + + + + diff --git a/docs/reference/gtk/tmpl/gtkliststore.sgml b/docs/reference/gtk/tmpl/gtkliststore.sgml index 35ae04ce3..a2d5c1651 100644 --- a/docs/reference/gtk/tmpl/gtkliststore.sgml +++ b/docs/reference/gtk/tmpl/gtkliststore.sgml @@ -19,7 +19,6 @@ GtkListStore -@parent: diff --git a/docs/reference/gtk/tmpl/gtkmenu.sgml b/docs/reference/gtk/tmpl/gtkmenu.sgml index b51c366a4..b8f6c8793 100644 --- a/docs/reference/gtk/tmpl/gtkmenu.sgml +++ b/docs/reference/gtk/tmpl/gtkmenu.sgml @@ -96,9 +96,9 @@ Creates a new #GtkMenu. Adds a new #GtkMenuItem to the end of the menu's item list. - @menu: a #GtkMenu. @child: The #GtkMenuItem to add. + @m: @c: @@ -108,9 +108,9 @@ Adds a new #GtkMenuItem to the end of the menu's item list. Adds a new #GtkMenuItem to the beginning of the menu's item list. - @menu: a #GtkMenu. @child: The #GtkMenuItem to add. + @menu_child: @m: @c: @@ -122,10 +122,10 @@ Adds a new #GtkMenuItem to the menu's item list at the position indicated by @position. - @menu: a #GtkMenu. @child: The #GtkMenuItem to add. @pos: + @position: The position in the item list where @child is added. Positions are numbered from 0 to n-1. diff --git a/docs/reference/gtk/tmpl/gtkseparatormenuitem.sgml b/docs/reference/gtk/tmpl/gtkseparatormenuitem.sgml index 6e1bd12a2..bbfab5a1b 100644 --- a/docs/reference/gtk/tmpl/gtkseparatormenuitem.sgml +++ b/docs/reference/gtk/tmpl/gtkseparatormenuitem.sgml @@ -19,7 +19,6 @@ GtkSeparatorMenuItem -@menu_item: diff --git a/docs/reference/gtk/tmpl/gtksettings.sgml b/docs/reference/gtk/tmpl/gtksettings.sgml index b63cc9021..b1a9195c3 100644 --- a/docs/reference/gtk/tmpl/gtksettings.sgml +++ b/docs/reference/gtk/tmpl/gtksettings.sgml @@ -161,3 +161,53 @@ GtkSettings @origin: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtktreemodel.sgml b/docs/reference/gtk/tmpl/gtktreemodel.sgml index 587b011f4..07587bb9b 100644 --- a/docs/reference/gtk/tmpl/gtktreemodel.sgml +++ b/docs/reference/gtk/tmpl/gtktreemodel.sgml @@ -368,3 +368,48 @@ The tree interface used by #GtkTreeView @iter: + + + + + +@treemodel: the object which received the signal. +@arg1: +@arg2: + + + + + + +@treemodel: the object which received the signal. +@arg1: + + + + + + +@treemodel: the object which received the signal. +@arg1: +@arg2: + + + + + + +@treemodel: the object which received the signal. +@arg1: +@arg2: + + + + + + +@treemodel: the object which received the signal. +@arg1: +@arg2: +@arg3: + diff --git a/docs/reference/gtk/tmpl/gtktreemodelsort.sgml b/docs/reference/gtk/tmpl/gtktreemodelsort.sgml index 39b98e370..a4ca872ce 100644 --- a/docs/reference/gtk/tmpl/gtktreemodelsort.sgml +++ b/docs/reference/gtk/tmpl/gtktreemodelsort.sgml @@ -19,7 +19,6 @@ GtkTreeModelSort -@parent: diff --git a/docs/reference/gtk/tmpl/gtktreeselection.sgml b/docs/reference/gtk/tmpl/gtktreeselection.sgml index e3108cd12..220403662 100644 --- a/docs/reference/gtk/tmpl/gtktreeselection.sgml +++ b/docs/reference/gtk/tmpl/gtktreeselection.sgml @@ -158,3 +158,10 @@ GtkTreeSelection @end_path: + + + + + +@treeselection: the object which received the signal. + diff --git a/docs/reference/gtk/tmpl/gtktreestore.sgml b/docs/reference/gtk/tmpl/gtktreestore.sgml index 939644cee..b2b96c4cb 100644 --- a/docs/reference/gtk/tmpl/gtktreestore.sgml +++ b/docs/reference/gtk/tmpl/gtktreestore.sgml @@ -19,18 +19,6 @@ GtkTreeStore -@parent: -@stamp: -@root: -@last: -@n_columns: -@sort_column_id: -@sort_list: -@order: -@column_headers: -@default_sort_func: -@default_sort_data: -@default_sort_destroy: @@ -42,6 +30,16 @@ GtkTreeStore @Returns: + + + + + +@n_columns: +@types: +@Returns: + + @@ -63,6 +61,16 @@ GtkTreeStore @Varargs: + + + + + +@tree_store: +@iter: +@var_args: + + @@ -146,3 +154,11 @@ GtkTreeStore @Returns: + + + + + +@tree_store: + + diff --git a/docs/reference/gtk/tmpl/gtktreeview.sgml b/docs/reference/gtk/tmpl/gtktreeview.sgml index c35723701..c08690247 100644 --- a/docs/reference/gtk/tmpl/gtktreeview.sgml +++ b/docs/reference/gtk/tmpl/gtktreeview.sgml @@ -14,20 +14,27 @@ GtkTreeView - + + + + + +@GTK_TREE_VIEW_DROP_BEFORE: +@GTK_TREE_VIEW_DROP_AFTER: +@GTK_TREE_VIEW_DROP_INTO_OR_BEFORE: +@GTK_TREE_VIEW_DROP_INTO_OR_AFTER: + + -@parent: -@priv: -@parent: @@ -35,6 +42,67 @@ GtkTreeView + + + + + +@tree_view: +@column: +@prev_column: +@next_column: +@data: +@Returns: + + + + + + + +@tree_view: +@context: +@path: +@user_data: +@Returns: + + + + + + + +@tree_view: +@path: +@user_data: + + + + + + + +@tree_view: +@context: +@path: +@pos: +@user_data: +@Returns: + + + + + + + +@model: +@column: +@key: +@iter: +@search_data: +@Returns: + + @@ -162,6 +230,24 @@ GtkTreeView @active: + + + + + +@tree_view: +@setting: + + + + + + + +@tree_view: +@Returns: + + @@ -193,6 +279,34 @@ GtkTreeView @Returns: + + + + + +@tree_view: +@position: +@title: +@cell: +@Varargs: +@Returns: + + + + + + + +@tree_view: +@position: +@title: +@cell: +@func: +@data: +@dnotify: +@Returns: + + @@ -203,6 +317,64 @@ GtkTreeView @Returns: + + + + + +@tree_view: +@Returns: + + + + + + + +@tree_view: +@column: +@base_column: + + + + + + + +@tree_view: +@column: + + + + + + + +@tree_view: +@Returns: + + + + + + + +@tree_view: +@func: +@user_data: +@destroy: + + + + + + + +@tree_view: +@tree_x: +@tree_y: + + @@ -216,6 +388,102 @@ GtkTreeView @col_align: + + + + + +@tree_view: +@path: +@column: + + + + + + + +@tree_view: + + + + + + + +@tree_view: + + + + + + + +@tree_view: +@path: +@open_all: +@Returns: + + + + + + + +@tree_view: +@path: +@Returns: + + + + + + + +@tree_view: +@func: +@data: + + + + + + + +@tree_view: +@path: +@Returns: + + + + + + + +@tree_view: +@reorderable: + + + + + + + +@tree_view: +@Returns: + + + + + + + +@tree_view: +@path: +@focus_column: +@start_editing: + + @@ -232,34 +500,138 @@ GtkTreeView @Returns: - + @tree_view: +@path: +@column: +@rect: - + @tree_view: +@path: +@column: +@rect: - + + + + + +@tree_view: +@visible_rect: + + + + + + + +@tree_view: +@wx: +@wy: +@tx: +@ty: + + + + + + + +@tree_view: +@tx: +@ty: +@wx: +@wy: + + + + + + + +@tree_view: +@start_button_mask: +@targets: +@n_targets: +@actions: +@row_draggable_func: +@user_data: + + + + + + + +@tree_view: +@targets: +@n_targets: +@actions: +@location_droppable_func: +@user_data: + + + + + + + +@tree_view: + + + + + + + +@tree_view: + + + @tree_view: @path: -@open_all: +@pos: + + + + + + + +@tree_view: +@path: +@pos: + + + + + + + +@tree_view: +@drag_x: +@drag_y: +@path: +@pos: @Returns: - + @@ -269,3 +641,246 @@ GtkTreeView @Returns: + + + + + +@tree_view: +@enable_search: + +@use_search: + + + + + + + +@tree_view: +@Returns: + + + + + + + +@tree_view: +@Returns: + + + + + + + +@tree_view: +@column: + + + + + + + +@tree_view: +@Returns: + + + + + + + +@tree_view: +@search_equal_func: +@search_user_data: +@search_destroy: + +@search_compare_func: +@search_data: + + + + + + + +@tree_view: +@path: +@children: +@user_data: + + + + + + + +@tree_view: +@func: +@data: +@destroy: + + + + + + + +@treeview: the object which received the signal. + + + + + + +@treeview: the object which received the signal. +@arg1: +@arg2: +@arg3: + + + + + + +@treeview: the object which received the signal. +@arg1: +@arg2: + + + + + + +@treeview: the object which received the signal. +@arg1: +@arg2: + + + + + + +@treeview: the object which received the signal. +@arg1: +@arg2: + + + + + + +@treeview: the object which received the signal. +@arg1: +@arg2: + + + + + + +@treeview: the object which received the signal. + + + + + + +@treeview: the object which received the signal. + + + + + + +@treeview: the object which received the signal. +@arg1: +@arg2: + + + + + + +@treeview: the object which received the signal. + + + + + + +@treeview: the object which received the signal. +@arg1: +@arg2: +@Returns: + + + + + + +@treeview: the object which received the signal. +@arg1: +@arg2: +@Returns: + + + + + + +@treeview: the object which received the signal. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml b/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml index 11ed879af..bab0d62a4 100644 --- a/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml +++ b/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml @@ -26,37 +26,6 @@ GtkTreeViewColumn -@parent: -@tree_view: -@button: -@child: -@arrow: -@alignment: -@window: -@editable_widget: -@xalign: -@property_changed_signal: -@spacing: -@fixed_width: -@width: -@requested_width: -@min_width: -@max_width: -@drag_x: -@drag_y: -@title: -@cell_list: -@column_type: -@sort_clicked_signal: -@sort_column_changed_signal: -@sort_column_id: -@sort_order: -@visible: -@clickable: -@dirty: -@show_sort_indicator: -@maybe_reordered: -@reorderable: @@ -262,3 +231,75 @@ GtkTreeViewColumn @tree_column: + + + + + +@treeviewcolumn: the object which received the signal. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkwindowgroup.sgml b/docs/reference/gtk/tmpl/gtkwindowgroup.sgml index c96f6fd47..8c64fb1e4 100644 --- a/docs/reference/gtk/tmpl/gtkwindowgroup.sgml +++ b/docs/reference/gtk/tmpl/gtkwindowgroup.sgml @@ -19,8 +19,6 @@ GtkWindowGroup -@parent_instance: -@grabs: diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c index 1e6f9daf5..e2aec1444 100644 --- a/gtk/gtkliststore.c +++ b/gtk/gtkliststore.c @@ -572,23 +572,11 @@ gtk_list_store_iter_parent (GtkTreeModel *tree_model, return FALSE; } -/** - * gtk_list_store_set_value: - * @list_store: A #GtkListStore - * @iter: A valid #GtkTreeIter for the row being modified - * @column: column number to modify - * @value: new value for the cell - * - * Sets the data in the cell specified by @iter and @column. - * The type of @value must be convertible to the type of the - * column. - * - **/ -void -gtk_list_store_set_value (GtkListStore *list_store, - GtkTreeIter *iter, - gint column, - GValue *value) +gboolean +gtk_list_store_real_set_value (GtkListStore *list_store, + GtkTreeIter *iter, + gint column, + GValue *value) { GtkTreeDataList *list; GtkTreeDataList *prev; @@ -596,11 +584,12 @@ gtk_list_store_set_value (GtkListStore *list_store, GValue real_value = {0, }; gboolean converted = FALSE; gint orig_column = column; + gboolean retval = FALSE; - g_return_if_fail (GTK_IS_LIST_STORE (list_store)); - g_return_if_fail (VALID_ITER (iter, list_store)); - g_return_if_fail (column >= 0 && column < list_store->n_columns); - g_return_if_fail (G_IS_VALUE (value)); + g_return_val_if_fail (GTK_IS_LIST_STORE (list_store), FALSE); + g_return_val_if_fail (VALID_ITER (iter, list_store), FALSE); + g_return_val_if_fail (column >= 0 && column < list_store->n_columns, FALSE); + g_return_val_if_fail (G_IS_VALUE (value), FALSE); if (! g_type_is_a (G_VALUE_TYPE (value), list_store->column_headers[column])) { @@ -611,7 +600,7 @@ gtk_list_store_set_value (GtkListStore *list_store, G_STRLOC, g_type_name (G_VALUE_TYPE (value)), g_type_name (list_store->column_headers[column])); - return; + return retval; } if (!g_value_transform (value, &real_value)) { @@ -620,7 +609,7 @@ gtk_list_store_set_value (GtkListStore *list_store, g_type_name (G_VALUE_TYPE (value)), g_type_name (list_store->column_headers[column])); g_value_unset (&real_value); - return; + return retval; } converted = TRUE; } @@ -636,11 +625,11 @@ gtk_list_store_set_value (GtkListStore *list_store, _gtk_tree_data_list_value_to_node (list, &real_value); else _gtk_tree_data_list_value_to_node (list, value); - gtk_tree_model_row_changed (GTK_TREE_MODEL (list_store), path, iter); + retval = TRUE; gtk_tree_path_free (path); if (converted) g_value_unset (&real_value); - return; + return retval; } column--; @@ -672,13 +661,49 @@ gtk_list_store_set_value (GtkListStore *list_store, _gtk_tree_data_list_value_to_node (list, &real_value); else _gtk_tree_data_list_value_to_node (list, value); - gtk_tree_model_row_changed (GTK_TREE_MODEL (list_store), path, iter); + retval = TRUE; gtk_tree_path_free (path); if (converted) g_value_unset (&real_value); if (GTK_LIST_STORE_IS_SORTED (list_store)) gtk_list_store_sort_iter_changed (list_store, iter, orig_column); + + return retval; +} + + +/** + * gtk_list_store_set_value: + * @list_store: A #GtkListStore + * @iter: A valid #GtkTreeIter for the row being modified + * @column: column number to modify + * @value: new value for the cell + * + * Sets the data in the cell specified by @iter and @column. + * The type of @value must be convertible to the type of the + * column. + * + **/ +void +gtk_list_store_set_value (GtkListStore *list_store, + GtkTreeIter *iter, + gint column, + GValue *value) +{ + g_return_if_fail (GTK_IS_LIST_STORE (list_store)); + g_return_if_fail (VALID_ITER (iter, list_store)); + g_return_if_fail (column >= 0 && column < list_store->n_columns); + g_return_if_fail (G_IS_VALUE (value)); + + if (gtk_list_store_real_set_value (list_store, iter, column, value)) + { + GtkTreePath *path; + + path = gtk_tree_model_get_path (GTK_TREE_MODEL (list_store), iter); + gtk_tree_model_row_changed (GTK_TREE_MODEL (list_store), path, iter); + gtk_tree_path_free (path); + } } /** @@ -687,8 +712,8 @@ gtk_list_store_set_value (GtkListStore *list_store, * @iter: A valid #GtkTreeIter for the row being modified * @var_args: va_list of column/value pairs * - * See @gtk_list_store_set; this version takes a va_list for - * use by language bindings. + * See @gtk_list_store_set; this version takes a va_list for use by language + * bindings. * **/ void @@ -697,6 +722,7 @@ gtk_list_store_set_valist (GtkListStore *list_store, va_list var_args) { gint column; + gboolean emit_signal = FALSE; g_return_if_fail (GTK_IS_LIST_STORE (list_store)); g_return_if_fail (VALID_ITER (iter, list_store)); @@ -728,15 +754,24 @@ gtk_list_store_set_valist (GtkListStore *list_store, } /* FIXME: instead of calling this n times, refactor with above */ - gtk_list_store_set_value (list_store, - iter, - column, - &value); + emit_signal = gtk_list_store_real_set_value (list_store, + iter, + column, + &value) || emit_signal; g_value_unset (&value); column = va_arg (var_args, gint); } + + if (emit_signal) + { + GtkTreePath *path; + + path = gtk_tree_model_get_path (GTK_TREE_MODEL (list_store), iter); + gtk_tree_model_row_changed (GTK_TREE_MODEL (list_store), path, iter); + gtk_tree_path_free (path); + } } /** diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c index 96652c11a..1dc6cd290 100644 --- a/gtk/gtktreestore.c +++ b/gtk/gtktreestore.c @@ -688,23 +688,13 @@ gtk_tree_store_iter_parent (GtkTreeModel *tree_model, return FALSE; } -/** - * gtk_tree_store_set_value: - * @tree_store: a #GtkTreeStore - * @iter: A valid #GtkTreeIter for the row being modified - * @column: column number to modify - * @value: new value for the cell - * - * Sets the data in the cell specified by @iter and @column. - * The type of @value must be convertible to the type of the - * column. - * - **/ -void -gtk_tree_store_set_value (GtkTreeStore *tree_store, - GtkTreeIter *iter, - gint column, - GValue *value) + +/* Does not emit a signal */ +gboolean +gtk_tree_store_real_set_value (GtkTreeStore *tree_store, + GtkTreeIter *iter, + gint column, + GValue *value) { GtkTreeDataList *list; GtkTreeDataList *prev; @@ -712,11 +702,7 @@ gtk_tree_store_set_value (GtkTreeStore *tree_store, GValue real_value = {0, }; gboolean converted = FALSE; gint orig_column = column; - - g_return_if_fail (GTK_IS_TREE_STORE (tree_store)); - g_return_if_fail (VALID_ITER (iter, tree_store)); - g_return_if_fail (column >= 0 && column < tree_store->n_columns); - g_return_if_fail (G_IS_VALUE (value)); + gboolean retval = FALSE; if (! g_type_is_a (G_VALUE_TYPE (value), tree_store->column_headers[column])) { @@ -727,7 +713,7 @@ gtk_tree_store_set_value (GtkTreeStore *tree_store, G_STRLOC, g_type_name (G_VALUE_TYPE (value)), g_type_name (tree_store->column_headers[column])); - return; + return retval; } if (!g_value_transform (value, &real_value)) { @@ -736,7 +722,7 @@ gtk_tree_store_set_value (GtkTreeStore *tree_store, g_type_name (G_VALUE_TYPE (value)), g_type_name (tree_store->column_headers[column])); g_value_unset (&real_value); - return; + return retval; } converted = TRUE; } @@ -753,11 +739,11 @@ gtk_tree_store_set_value (GtkTreeStore *tree_store, _gtk_tree_data_list_value_to_node (list, &real_value); else _gtk_tree_data_list_value_to_node (list, value); - gtk_tree_model_row_changed (GTK_TREE_MODEL (tree_store), path, iter); + retval = TRUE; gtk_tree_path_free (path); if (converted) g_value_unset (&real_value); - return; + return retval; } column--; @@ -787,13 +773,48 @@ gtk_tree_store_set_value (GtkTreeStore *tree_store, _gtk_tree_data_list_value_to_node (list, &real_value); else _gtk_tree_data_list_value_to_node (list, value); - gtk_tree_model_row_changed (GTK_TREE_MODEL (tree_store), path, iter); + gtk_tree_path_free (path); if (converted) g_value_unset (&real_value); if (GTK_TREE_STORE_IS_SORTED (tree_store)) gtk_tree_store_sort_iter_changed (tree_store, iter, orig_column); + + return retval; +} + +/** + * gtk_tree_store_set_value: + * @tree_store: a #GtkTreeStore + * @iter: A valid #GtkTreeIter for the row being modified + * @column: column number to modify + * @value: new value for the cell + * + * Sets the data in the cell specified by @iter and @column. + * The type of @value must be convertible to the type of the + * column. + * + **/ +void +gtk_tree_store_set_value (GtkTreeStore *tree_store, + GtkTreeIter *iter, + gint column, + GValue *value) +{ + g_return_if_fail (GTK_IS_TREE_STORE (tree_store)); + g_return_if_fail (VALID_ITER (iter, tree_store)); + g_return_if_fail (column >= 0 && column < tree_store->n_columns); + g_return_if_fail (G_IS_VALUE (value)); + + if (gtk_tree_store_real_set_value (tree_store, iter, column, value)) + { + GtkTreePath *path; + + path = gtk_tree_model_get_path (GTK_TREE_MODEL (tree_store), iter); + gtk_tree_model_row_changed (GTK_TREE_MODEL (tree_store), path, iter); + gtk_tree_path_free (path); + } } /** @@ -812,6 +833,7 @@ gtk_tree_store_set_valist (GtkTreeStore *tree_store, va_list var_args) { gint column; + gboolean emit_signal = FALSE; g_return_if_fail (GTK_IS_TREE_STORE (tree_store)); g_return_if_fail (VALID_ITER (iter, tree_store)); @@ -842,16 +864,23 @@ gtk_tree_store_set_valist (GtkTreeStore *tree_store, break; } - /* FIXME: instead of calling this n times, refactor with above */ - gtk_tree_store_set_value (tree_store, - iter, - column, - &value); + emit_signal = gtk_tree_store_real_set_value (tree_store, + iter, + column, + &value) || emit_signal; g_value_unset (&value); column = va_arg (var_args, gint); } + if (emit_signal) + { + GtkTreePath *path; + + path = gtk_tree_model_get_path (GTK_TREE_MODEL (tree_store), iter); + gtk_tree_model_row_changed (GTK_TREE_MODEL (tree_store), path, iter); + gtk_tree_path_free (path); + } } /** diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index ef9f826e8..4963fc527 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -4329,7 +4329,8 @@ gtk_tree_view_row_changed (GtkTreeModel *model, &height, node); - if (GTK_RBNODE_GET_HEIGHT (node) != height + vertical_separator) + if (height != -1 && + GTK_RBNODE_GET_HEIGHT (node) != height + vertical_separator) { _gtk_rbtree_node_set_height (tree, node, height + vertical_separator); gtk_widget_queue_resize (GTK_WIDGET (data)); @@ -4337,9 +4338,13 @@ gtk_tree_view_row_changed (GtkTreeModel *model, goto done; } if (dirty_marked) - gtk_widget_queue_resize (GTK_WIDGET (data)); + { + gtk_widget_queue_resize (GTK_WIDGET (data)); + } else - gtk_tree_view_queue_draw_node (tree_view, tree, node, NULL); + { + gtk_tree_view_queue_draw_node (tree_view, tree, node, NULL); + } done: if (free_path) @@ -4946,6 +4951,9 @@ gtk_tree_view_calc_size (GtkTreeView *tree_view, while (gtk_tree_model_iter_next (tree_view->priv->model, iter)); } +/* If height is non-NULL, then we set it to be the new height. if it's all + * dirty, then height is -1. We know we'll remeasure dirty rows, anyways. + */ static gboolean gtk_tree_view_discover_dirty_iter (GtkTreeView *tree_view, GtkTreeIter *iter, @@ -4963,14 +4971,17 @@ gtk_tree_view_discover_dirty_iter (GtkTreeView *tree_view, "horizontal_separator", &horizontal_separator, NULL); + if (height) - *height = 0; + *height = -1; for (list = tree_view->priv->columns; list; list = list->next) { gint width; column = list->data; - if (column->dirty == TRUE || column->column_type == GTK_TREE_VIEW_COLUMN_FIXED) + if (column->dirty == TRUE) + continue; + if (height == NULL && column->column_type == GTK_TREE_VIEW_COLUMN_FIXED) continue; if (!column->visible) continue; @@ -8840,10 +8851,12 @@ gtk_tree_view_get_search_equal_func (GtkTreeView *tree_view) /** * gtk_tree_view_set_search_equal_func: * @tree_view: A #GtkTreeView - * @compare_func: the compare function to use during the search - * - * Sets the compare function to use to search the TreeView. - */ + * @search_equal_func: the compare function to use during the search + * @search_user_data: user data to pass to @search_equal_func, or %NULL + * @search_destroy: Destroy notifier for @search_user_data, or %NULL + * + * Sets the compare function for the interactive search capabilities. + **/ void gtk_tree_view_set_search_equal_func (GtkTreeView *tree_view, GtkTreeViewSearchEqualFunc search_equal_func, diff --git a/gtk/gtktreeview.h b/gtk/gtktreeview.h index faedda330..e627171c4 100644 --- a/gtk/gtktreeview.h +++ b/gtk/gtktreeview.h @@ -286,15 +286,15 @@ GdkPixmap *gtk_tree_view_create_row_drag_icon (GtkTreeView /* Interactive search */ void gtk_tree_view_set_enable_search (GtkTreeView *tree_view, - gboolean use_search); + gboolean enable_search); gboolean gtk_tree_view_get_enable_search (GtkTreeView *tree_view); gint gtk_tree_view_get_search_column (GtkTreeView *tree_view); void gtk_tree_view_set_search_column (GtkTreeView *tree_view, gint column); GtkTreeViewSearchEqualFunc gtk_tree_view_get_search_equal_func (GtkTreeView *tree_view); void gtk_tree_view_set_search_equal_func (GtkTreeView *tree_view, - GtkTreeViewSearchEqualFunc search_compare_func, - gpointer search_data, + GtkTreeViewSearchEqualFunc search_equal_func, + gpointer search_user_data, GtkDestroyNotify search_destroy); /* This function should really never be used. It is just for use by ATK.