[gtk+/wip/baedert/meson] Install header files
- From: Timm Bäder <baedert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/baedert/meson] Install header files
- Date: Sun, 25 Sep 2016 09:51:05 +0000 (UTC)
commit 34ed5633fa9daf31a95049b53d134a47c430560a
Author: Timm Bäder <mail baedert org>
Date: Sun Sep 25 11:51:48 2016 +0200
Install header files
gdk/meson.build | 55 +++++++-
gdk/wayland/meson.build | 4 -
gtk/a11y/meson.build | 59 +++++++++-
gtk/deprecated/meson.build | 45 +++++++-
gtk/gtktreeview.c | 292 ++++++++++++++++++++++----------------------
gtk/gtktreeviewcolumn.c | 178 ++++++++++++++--------------
gtk/meson.build | 92 ++++----------
meson.build | 8 +-
8 files changed, 415 insertions(+), 318 deletions(-)
---
diff --git a/gdk/meson.build b/gdk/meson.build
index 965e041..9b6a913 100644
--- a/gdk/meson.build
+++ b/gdk/meson.build
@@ -1,4 +1,3 @@
-deprecated_gdk_sources = ['deprecated/gdkcolor.c']
gdk_sources = files([
'gdk-private.c',
'gdk.c',
@@ -86,7 +85,7 @@ gdk_private_h_sources = files([
'gdkprivate.h',
])
-gdk_x_sources = [
+gdk_x_sources = files([
'x11/MwmUtil.h',
'x11/gdkapplaunchcontext-x11.c',
'x11/gdkasync.c',
@@ -126,12 +125,36 @@ gdk_x_sources = [
'x11/gdkmonitor-x11.c',
'x11/gdkmonitor-x11.h',
'x11/gdkx11monitor.h'
-]
+])
-gdk_x_private_sources = [
+gdk_x_private_sources = files([
'x11/gdkprivate-x11.h',
'x11/gdkdevicemanagerprivate-core.h',
-]
+])
+
+gdk_x_public_headers = files([
+ 'x11/gdkx-autocleanups.h',
+ 'x11/gdkx11applaunchcontext.h',
+ 'x11/gdkx11cursor.h',
+ 'x11/gdkx11device.h',
+ 'x11/gdkx11device-core.h',
+ 'x11/gdkx11device-xi2.h',
+ 'x11/gdkx11devicemanager.h',
+ 'x11/gdkx11devicemanager-core.h',
+ 'x11/gdkx11devicemanager-xi2.h',
+ 'x11/gdkx11display.h',
+ 'x11/gdkx11displaymanager.h',
+ 'x11/gdkx11dnd.h',
+ 'x11/gdkx11glcontext.h',
+ 'x11/gdkx11keys.h',
+ 'x11/gdkx11monitor.h',
+ 'x11/gdkx11property.h',
+ 'x11/gdkx11screen.h',
+ 'x11/gdkx11selection.h',
+ 'x11/gdkx11utils.h',
+ 'x11/gdkx11visual.h',
+ 'x11/gdkx11window.h',
+])
gdk_wayland_sources = files([
'wayland/gdkapplaunchcontext-wayland.c',
@@ -160,6 +183,14 @@ gdk_wayland_sources = files([
'wayland/wm-button-layout-translation.c',
])
+gdk_wayland_public_headers = files([
+ 'wayland/gdkwaylanddevice.h',
+ 'wayland/gdkwaylanddisplay.h',
+ 'wayland/gdkwaylandglcontext.h',
+ 'wayland/gdkwaylandselection.h',
+ 'wayland/gdkwaylandwindow.h'
+])
+
gdk_wayland_private_sources = files([
'wayland/gdkprivate-wayland.h',
])
@@ -238,6 +269,7 @@ gdkresources = gnome.compile_resources(
)
+deprecated_gdk_sources = ['deprecated/gdkcolor.c']
deprecated_h_sources = files(['deprecated/gdkcolor.h'])
gdk_headers = gdk_public_h_sources + deprecated_h_sources + gdk_private_h_sources
@@ -282,13 +314,15 @@ if broadway_enabled cdata.set('GDK_WINDOWING_BROADWAY', '') endif
gdkconfig = configure_file(
input : 'gdkconfig.h.meson',
output : 'gdkconfig.h',
- configuration : cdata
+ configuration : cdata,
+ install_dir: 'include/gtk-3.0/gdk/' # XXX ???
)
gdkversionmacros = configure_file(
input : 'gdkversionmacros.h.in',
output : 'gdkversionmacros.h',
- configuration: cdata
+ configuration: cdata,
+ install_dir: 'include/gtk-3.0/gdk/' # XXX ???
)
xinc = include_directories('x11')
@@ -335,6 +369,8 @@ if x11_enabled
gdk_x_sources,
gdk_x_private_sources
]
+
+ install_headers(gdk_x_public_headers, subdir: 'gtk-3.0/gdk/x11/')
endif
if wayland_enabled
@@ -351,6 +387,8 @@ if wayland_enabled
gdk_wayland_sources,
gdk_wayland_private_sources
]
+
+ install_headers(gdk_wayland_public_headers, subdir: 'gtk-3.0/gdk/wayland/')
endif
if broadway_enabled
@@ -364,6 +402,9 @@ if broadway_enabled
endif
+install_headers(gdk_public_h_sources, subdir: 'gtk-3.0/gdk/')
+install_headers(deprecated_h_sources, subdir: 'gtk-3.0/gdk/deprecated/')
+
libgdk = shared_library('gdk',
sources: [gdk_sources, gdkconfig, gdkenum_h],
c_args: ['-DHAVE_CONFIG_H', '-DGDK_COMPILATION'],
diff --git a/gdk/wayland/meson.build b/gdk/wayland/meson.build
index 6783ecf..34cc6bb 100644
--- a/gdk/wayland/meson.build
+++ b/gdk/wayland/meson.build
@@ -1,5 +1,3 @@
-
-
if wayland_enabled
runcmd = run_command('pkg-config', '--variable=pkgdatadir', 'wayland-protocols')
if runcmd.returncode() == 0
@@ -95,8 +93,6 @@ if wayland_enabled
command: [genprotocols, wayland_scanner,'@INPUT@', '@OUTPUT@', 'code']
)
-
-
gdk_sources += [
gtk_shell_c,
gtk_shell_h,
diff --git a/gtk/a11y/meson.build b/gtk/a11y/meson.build
index c53c22a..61c0dc4 100644
--- a/gtk/a11y/meson.build
+++ b/gtk/a11y/meson.build
@@ -1,4 +1,4 @@
-a11y_sources = files(
+a11y_sources = files([
'gtkaccessibility.c',
'gtkaccessibilitymisc.c',
'gtkaccessibilityutil.c',
@@ -54,4 +54,59 @@ a11y_sources = files(
'gtkwidgetaccessible.c',
'gtkwindowaccessible.c',
'gtkstackaccessible.c'
- )
+])
+
+a11y_headers = files([
+ 'gtk-a11y-autocleanups.h',
+ 'gtkarrowaccessible.h',
+ 'gtkbooleancellaccessible.h',
+ 'gtkbuttonaccessible.h',
+ 'gtkcellaccessible.h',
+ 'gtkcellaccessibleparent.h',
+ 'gtkcheckmenuitemaccessible.h',
+ 'gtkcomboboxaccessible.h',
+ 'gtkcontaineraccessible.h',
+ 'gtkcontainercellaccessible.h',
+ 'gtkentryaccessible.h',
+ 'gtkexpanderaccessible.h',
+ 'gtkflowboxaccessible.h',
+ 'gtkflowboxchildaccessible.h',
+ 'gtkframeaccessible.h',
+ 'gtkiconviewaccessible.h',
+ 'gtkimageaccessible.h',
+ 'gtkimagecellaccessible.h',
+ 'gtklabelaccessible.h',
+ 'gtklevelbaraccessible.h',
+ 'gtklinkbuttonaccessible.h',
+ 'gtklistboxaccessible.h',
+ 'gtklistboxrowaccessible.h',
+ 'gtklockbuttonaccessible.h',
+ 'gtkmenuaccessible.h',
+ 'gtkmenubuttonaccessible.h',
+ 'gtkmenuitemaccessible.h',
+ 'gtkmenushellaccessible.h',
+ 'gtknotebookaccessible.h',
+ 'gtknotebookpageaccessible.h',
+ 'gtkpanedaccessible.h',
+ 'gtkpopoveraccessible.h',
+ 'gtkprogressbaraccessible.h',
+ 'gtkradiobuttonaccessible.h',
+ 'gtkradiomenuitemaccessible.h',
+ 'gtkrangeaccessible.h',
+ 'gtkrenderercellaccessible.h',
+ 'gtkscaleaccessible.h',
+ 'gtkscalebuttonaccessible.h',
+ 'gtkscrolledwindowaccessible.h',
+ 'gtkspinbuttonaccessible.h',
+ 'gtkspinneraccessible.h',
+ 'gtkstatusbaraccessible.h',
+ 'gtkstackaccessible.h',
+ 'gtkswitchaccessible.h',
+ 'gtktextcellaccessible.h',
+ 'gtktextviewaccessible.h',
+ 'gtktogglebuttonaccessible.h',
+ 'gtktoplevelaccessible.h',
+ 'gtktreeviewaccessible.h',
+ 'gtkwidgetaccessible.h',
+ 'gtkwindowaccessible.h',
+])
diff --git a/gtk/deprecated/meson.build b/gtk/deprecated/meson.build
index c2cf475..687a0c1 100644
--- a/gtk/deprecated/meson.build
+++ b/gtk/deprecated/meson.build
@@ -1,4 +1,4 @@
-gtk_deprecated_c_sources = files(
+gtk_deprecated_sources = files(
'gtkactivatable.c',
'gtkaction.c',
'gtkactiongroup.c',
@@ -40,3 +40,46 @@ gtk_deprecated_c_sources = files(
'gtkvseparator.c',
'gtkvpaned.c',
)
+
+gtk_deprecated_headers = files([
+ 'gtkactivatable.h',
+ 'gtkaction.h',
+ 'gtkactiongroup.h',
+ 'gtkalignment.h',
+ 'gtkarrow.h',
+ 'gtkcolorsel.h',
+ 'gtkcolorseldialog.h',
+ 'gtkfontsel.h',
+ 'gtkgradient.h',
+ 'gtkhandlebox.h',
+ 'gtkhbbox.h',
+ 'gtkhbox.h',
+ 'gtkhpaned.h',
+ 'gtkhscale.h',
+ 'gtkhscrollbar.h',
+ 'gtkhseparator.h',
+ 'gtkhsv.h',
+ 'gtkiconfactory.h',
+ 'gtkimagemenuitem.h',
+ 'gtkmisc.h',
+ 'gtknumerableicon.h',
+ 'gtkradioaction.h',
+ 'gtkrc.h',
+ 'gtkrecentaction.h',
+ 'gtkstatusicon.h',
+ 'gtkstock.h',
+ 'gtkstyle.h',
+ 'gtkstyleproperties.h',
+ 'gtksymboliccolor.h',
+ 'gtktable.h',
+ 'gtktearoffmenuitem.h',
+ 'gtkthemingengine.h',
+ 'gtktoggleaction.h',
+ 'gtkuimanager.h',
+ 'gtkvbbox.h',
+ 'gtkvbox.h',
+ 'gtkvscale.h',
+ 'gtkvscrollbar.h',
+ 'gtkvseparator.h',
+ 'gtkvpaned.h',
+])
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index b8dc044..99aeaed 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -490,7 +490,7 @@ struct _GtkTreeViewPrivate
guint enable_search : 1;
guint disable_popdown : 1;
guint search_custom_entry_set : 1;
-
+
guint hover_selection : 1;
guint hover_expand : 1;
guint imcontext_changed : 1;
@@ -1096,10 +1096,10 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
/**
* GtkTreeView:fixed-height-mode:
*
- * Setting the ::fixed-height-mode property to %TRUE speeds up
- * #GtkTreeView by assuming that all rows have the same height.
- * Only enable this option if all rows are the same height.
- * Please see gtk_tree_view_set_fixed_height_mode() for more
+ * Setting the ::fixed-height-mode property to %TRUE speeds up
+ * #GtkTreeView by assuming that all rows have the same height.
+ * Only enable this option if all rows are the same height.
+ * Please see gtk_tree_view_set_fixed_height_mode() for more
* information on this option.
*
* Since: 2.4
@@ -1113,10 +1113,10 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
/**
* GtkTreeView:hover-selection:
- *
+ *
* Enables or disables the hover selection mode of @tree_view.
* Hover selection makes the selected row follow the pointer.
- * Currently, this works only for the selection modes
+ * Currently, this works only for the selection modes
* %GTK_SELECTION_SINGLE and %GTK_SELECTION_BROWSE.
*
* This mode is primarily intended for treeviews in popups, e.g.
@@ -1133,9 +1133,9 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
/**
* GtkTreeView:hover-expand:
- *
+ *
* Enables or disables the hover expansion mode of @tree_view.
- * Hover expansion makes rows expand or collapse if the pointer moves
+ * Hover expansion makes rows expand or collapse if the pointer moves
* over them.
*
* This mode is primarily intended for treeviews in popups, e.g.
@@ -1349,8 +1349,8 @@ G_GNUC_END_IGNORE_DEPRECATIONS
* GtkTreeView::test-expand-row:
* @tree_view: the object on which the signal is emitted
* @iter: the tree iter of the row to expand
- * @path: a tree path that points to the row
- *
+ * @path: a tree path that points to the row
+ *
* The given row is about to be expanded (show its children nodes). Use this
* signal if you need to control the expandability of individual rows.
*
@@ -1371,8 +1371,8 @@ G_GNUC_END_IGNORE_DEPRECATIONS
* GtkTreeView::test-collapse-row:
* @tree_view: the object on which the signal is emitted
* @iter: the tree iter of the row to collapse
- * @path: a tree path that points to the row
- *
+ * @path: a tree path that points to the row
+ *
* The given row is about to be collapsed (hide its children nodes). Use this
* signal if you need to control the collapsibility of individual rows.
*
@@ -1393,8 +1393,8 @@ G_GNUC_END_IGNORE_DEPRECATIONS
* GtkTreeView::row-expanded:
* @tree_view: the object on which the signal is emitted
* @iter: the tree iter of the expanded row
- * @path: a tree path that points to the row
- *
+ * @path: a tree path that points to the row
+ *
* The given row has been expanded (child nodes are shown).
*/
tree_view_signals[ROW_EXPANDED] =
@@ -1412,8 +1412,8 @@ G_GNUC_END_IGNORE_DEPRECATIONS
* GtkTreeView::row-collapsed:
* @tree_view: the object on which the signal is emitted
* @iter: the tree iter of the collapsed row
- * @path: a tree path that points to the row
- *
+ * @path: a tree path that points to the row
+ *
* The given row has been collapsed (child nodes are hidden).
*/
tree_view_signals[ROW_COLLAPSED] =
@@ -1429,8 +1429,8 @@ G_GNUC_END_IGNORE_DEPRECATIONS
/**
* GtkTreeView::columns-changed:
- * @tree_view: the object on which the signal is emitted
- *
+ * @tree_view: the object on which the signal is emitted
+ *
* The number of columns of the treeview has changed.
*/
tree_view_signals[COLUMNS_CHANGED] =
@@ -1445,7 +1445,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
/**
* GtkTreeView::cursor-changed:
* @tree_view: the object on which the signal is emitted
- *
+ *
* The position of the cursor (focused cell) has changed.
*/
tree_view_signals[CURSOR_CHANGED] =
@@ -1818,9 +1818,9 @@ gtk_tree_view_init (GtkTreeView *tree_view)
priv->search_equal_func = gtk_tree_view_search_equal_func;
priv->search_custom_entry_set = FALSE;
priv->typeselect_flush_timeout = 0;
- priv->init_hadjust_value = TRUE;
+ priv->init_hadjust_value = TRUE;
priv->width = 0;
-
+
priv->hover_selection = FALSE;
priv->hover_expand = FALSE;
@@ -2117,7 +2117,7 @@ gtk_tree_view_buildable_get_internal_child (GtkBuildable *buildable,
{
if (strcmp (childname, "selection") == 0)
return G_OBJECT (GTK_TREE_VIEW (buildable)->priv->selection);
-
+
return parent_buildable_iface->get_internal_child (buildable,
builder,
childname);
@@ -2262,7 +2262,7 @@ gtk_tree_view_destroy (GtkWidget *widget)
tree_view->priv->row_separator_destroy (tree_view->priv->row_separator_data);
tree_view->priv->row_separator_data = NULL;
}
-
+
gtk_tree_view_set_model (tree_view, NULL);
if (tree_view->priv->hadjustment)
@@ -2502,7 +2502,7 @@ gtk_tree_view_realize (GtkWidget *widget)
gtk_tree_view_set_grid_lines (tree_view, tree_view->priv->grid_lines);
gtk_tree_view_set_enable_tree_lines (tree_view, tree_view->priv->tree_lines_enabled);
- install_presize_handler (tree_view);
+ install_presize_handler (tree_view);
gtk_gesture_set_window (tree_view->priv->multipress_gesture,
tree_view->priv->bin_window);
@@ -2558,7 +2558,7 @@ gtk_tree_view_unrealize (GtkWidget *widget)
g_source_remove (priv->typeselect_flush_timeout);
priv->typeselect_flush_timeout = 0;
}
-
+
for (list = priv->columns; list; list = list->next)
_gtk_tree_view_column_unrealize_button (GTK_TREE_VIEW_COLUMN (list->data));
@@ -2699,7 +2699,7 @@ gtk_tree_view_size_allocate_columns (GtkWidget *widget,
gint number_of_expand_columns = 0;
gboolean rtl;
gboolean update_expand;
-
+
tree_view = GTK_TREE_VIEW (widget);
for (last_column = g_list_last (tree_view->priv->columns);
@@ -2772,9 +2772,9 @@ gtk_tree_view_size_allocate_columns (GtkWidget *widget,
tree_view->priv->last_number_of_expand_columns = number_of_expand_columns;
}
- for (list = (rtl ? last_column : first_column);
+ for (list = (rtl ? last_column : first_column);
list != (rtl ? first_column->prev : last_column->next);
- list = (rtl ? list->prev : list->next))
+ list = (rtl ? list->prev : list->next))
{
gint column_width;
@@ -2886,7 +2886,7 @@ gtk_tree_view_size_allocate (GtkWidget *widget,
tree_view->priv->width));
g_object_thaw_notify (G_OBJECT (tree_view->priv->hadjustment));
- if (gtk_widget_get_direction(widget) == GTK_TEXT_DIR_RTL)
+ if (gtk_widget_get_direction(widget) == GTK_TEXT_DIR_RTL)
{
if (allocation->width < tree_view->priv->width)
{
@@ -2925,13 +2925,13 @@ gtk_tree_view_size_allocate (GtkWidget *widget,
page_size * 0.1,
page_size * 0.9,
page_size);
-
+
/* now the adjustments and window sizes are in sync, we can sync toprow/dy again */
if (gtk_tree_row_reference_valid (tree_view->priv->top_row))
gtk_tree_view_top_row_to_dy (tree_view);
else
gtk_tree_view_dy_to_top_row (tree_view);
-
+
if (gtk_widget_get_realized (widget))
{
gdk_window_move_resize (gtk_widget_get_window (widget),
@@ -3826,7 +3826,7 @@ do_prelight (GtkTreeView *tree_view,
&& gtk_tree_view_draw_expanders (tree_view))
{
tree_view->priv->arrow_prelit = FALSE;
-
+
gtk_tree_view_queue_draw_arrow (tree_view,
tree_view->priv->prelight_tree,
tree_view->priv->prelight_node);
@@ -3865,7 +3865,7 @@ do_prelight (GtkTreeView *tree_view,
if (tree_view->priv->hover_expand)
{
- tree_view->priv->auto_expand_timeout =
+ tree_view->priv->auto_expand_timeout =
gdk_threads_add_timeout (AUTO_EXPAND_TIMEOUT, auto_expand_timeout, tree_view);
g_source_set_name_by_id (tree_view->priv->auto_expand_timeout, "[gtk+] auto_expand_timeout");
}
@@ -3880,11 +3880,11 @@ prelight_or_select (GtkTreeView *tree_view,
gint y)
{
GtkSelectionMode mode = gtk_tree_selection_get_mode (tree_view->priv->selection);
-
+
if (tree_view->priv->hover_selection &&
(mode == GTK_SELECTION_SINGLE || mode == GTK_SELECTION_BROWSE) &&
!(tree_view->priv->edited_column &&
- gtk_cell_area_get_edit_widget
+ gtk_cell_area_get_edit_widget
(gtk_cell_layout_get_area (GTK_CELL_LAYOUT (tree_view->priv->edited_column)))))
{
if (node)
@@ -3892,7 +3892,7 @@ prelight_or_select (GtkTreeView *tree_view,
if (!GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_SELECTED))
{
GtkTreePath *path;
-
+
path = _gtk_tree_path_new_from_rbtree (tree, node);
gtk_tree_selection_select_path (tree_view->priv->selection, path);
if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_SELECTED))
@@ -4957,7 +4957,7 @@ gtk_tree_view_draw_line (GtkTreeView *tree_view,
cairo_restore (cr);
}
-
+
static void
gtk_tree_view_draw_grid_lines (GtkTreeView *tree_view,
cairo_t *cr)
@@ -5088,7 +5088,7 @@ gtk_tree_view_bin_draw (GtkWidget *widget,
path);
depth = gtk_tree_path_get_depth (path);
gtk_tree_path_free (path);
-
+
drag_dest_path = NULL;
if (tree_view->priv->drag_dest_row)
@@ -5108,7 +5108,7 @@ gtk_tree_view_bin_draw (GtkWidget *widget,
if (draw_vgrid_lines || draw_hgrid_lines)
gtk_widget_style_get (widget, "grid-line-width", &grid_line_width, NULL);
-
+
n_visible_columns = 0;
for (list = tree_view->priv->columns; list; list = list->next)
{
@@ -5135,7 +5135,7 @@ gtk_tree_view_bin_draw (GtkWidget *widget,
* start at the first node of the event, and walk the tree in
* order, drawing each successive node.
*/
-
+
parity = !(_gtk_rbtree_node_get_index (tree, node) % 2);
do
@@ -5692,7 +5692,7 @@ gtk_tree_view_draw (GtkWidget *widget,
if (gtk_cairo_should_draw_window (cr, tree_view->priv->header_window))
{
GList *list;
-
+
for (list = tree_view->priv->columns; list != NULL; list = list->next)
{
GtkTreeViewColumn *column = list->data;
@@ -5708,7 +5708,7 @@ gtk_tree_view_draw (GtkWidget *widget,
}
}
}
-
+
if (tree_view->priv->drag_window &&
gtk_cairo_should_draw_window (cr, tree_view->priv->drag_window))
{
@@ -5980,7 +5980,7 @@ gtk_tree_view_key_press (GtkWidget *widget,
focus_column = focus_column->next)
{
GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN (focus_column->data);
-
+
button = gtk_tree_view_column_get_button (column);
if (gtk_widget_has_focus (button))
break;
@@ -6342,7 +6342,7 @@ validate_row (GtkTreeView *tree_view,
"vertical-separator", &vertical_separator,
"grid-line-width", &grid_line_width,
NULL);
-
+
draw_vgrid_lines =
tree_view->priv->grid_lines == GTK_TREE_VIEW_GRID_LINES_VERTICAL
|| tree_view->priv->grid_lines == GTK_TREE_VIEW_GRID_LINES_BOTH;
@@ -6379,7 +6379,7 @@ validate_row (GtkTreeView *tree_view,
if (!gtk_tree_view_column_get_visible (column))
continue;
- if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_COLUMN_INVALID) &&
+ if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_COLUMN_INVALID) &&
!_gtk_tree_view_column_cell_get_dirty (column))
continue;
@@ -6570,7 +6570,7 @@ validate_visible_area (GtkTreeView *tree_view)
if (path)
gtk_tree_path_free (path);
path = NULL;
- }
+ }
}
/* We didn't have a scroll_to set, so we just handle things normally
@@ -6986,7 +6986,7 @@ do_validate_rows (GtkTreeView *tree_view, gboolean queue_resize)
tree_view->priv->fixed_height_check = 1;
}
-
+
done:
if (validated_area)
{
@@ -7001,7 +7001,7 @@ do_validate_rows (GtkTreeView *tree_view, gboolean queue_resize)
* recursing, we cannot call gtk_widget_get_preferred_size() here because that's
* not allowed (from inside ->get_preferred_width/height() implementations, one
* should call the vfuncs directly). However what is desired here is the full
- * size including any margins and limited by any alignment (i.e. after
+ * size including any margins and limited by any alignment (i.e. after
* GtkWidget:adjust_size_request() is called).
*
* Currently bypassing this but the real solution is to not update the scroll adjustments
@@ -7099,7 +7099,7 @@ presize_handler_callback (GtkWidget *widget,
gpointer unused)
{
do_presize_handler (GTK_TREE_VIEW (widget));
-
+
return G_SOURCE_REMOVE;
}
@@ -7107,7 +7107,7 @@ static gboolean
validate_rows (GtkTreeView *tree_view)
{
gboolean retval;
-
+
if (tree_view->priv->presize_handler_tick_cb)
{
do_presize_handler (tree_view);
@@ -7115,7 +7115,7 @@ validate_rows (GtkTreeView *tree_view)
}
retval = do_validate_rows (tree_view, TRUE);
-
+
if (! retval && tree_view->priv->validate_rows_timer)
{
g_source_remove (tree_view->priv->validate_rows_timer);
@@ -8451,23 +8451,23 @@ column_sizing_notify (GObject *object,
/**
* gtk_tree_view_set_fixed_height_mode:
- * @tree_view: a #GtkTreeView
+ * @tree_view: a #GtkTreeView
* @enable: %TRUE to enable fixed height mode
- *
- * Enables or disables the fixed height mode of @tree_view.
- * Fixed height mode speeds up #GtkTreeView by assuming that all
- * rows have the same height.
+ *
+ * Enables or disables the fixed height mode of @tree_view.
+ * Fixed height mode speeds up #GtkTreeView by assuming that all
+ * rows have the same height.
* Only enable this option if all rows are the same height and all
* columns are of type %GTK_TREE_VIEW_COLUMN_FIXED.
*
- * Since: 2.6
+ * Since: 2.6
**/
void
gtk_tree_view_set_fixed_height_mode (GtkTreeView *tree_view,
gboolean enable)
{
GList *l;
-
+
enable = enable != FALSE;
if (enable == tree_view->priv->fixed_height_mode)
@@ -8478,21 +8478,21 @@ gtk_tree_view_set_fixed_height_mode (GtkTreeView *tree_view,
tree_view->priv->fixed_height_mode = 0;
tree_view->priv->fixed_height = -1;
}
- else
+ else
{
/* make sure all columns are of type FIXED */
for (l = tree_view->priv->columns; l; l = l->next)
{
GtkTreeViewColumn *c = l->data;
-
+
g_return_if_fail (gtk_tree_view_column_get_sizing (c) == GTK_TREE_VIEW_COLUMN_FIXED);
}
-
+
/* yes, we really have to do this is in a separate loop */
for (l = tree_view->priv->columns; l; l = l->next)
g_signal_connect (l->data, "notify::sizing",
G_CALLBACK (column_sizing_notify), tree_view);
-
+
tree_view->priv->fixed_height_mode = 1;
tree_view->priv->fixed_height = -1;
}
@@ -8506,11 +8506,11 @@ gtk_tree_view_set_fixed_height_mode (GtkTreeView *tree_view,
/**
* gtk_tree_view_get_fixed_height_mode:
* @tree_view: a #GtkTreeView
- *
+ *
* Returns whether fixed height mode is turned on for @tree_view.
- *
+ *
* Returns: %TRUE if @tree_view is in fixed height mode
- *
+ *
* Since: 2.6
**/
gboolean
@@ -8585,7 +8585,7 @@ gtk_tree_view_header_focus (GtkTreeView *tree_view,
{
if (tree_view->priv->focus_column != NULL)
button = gtk_tree_view_column_get_button (tree_view->priv->focus_column);
- else
+ else
button = NULL;
if (button && gtk_widget_get_can_focus (button))
@@ -8921,7 +8921,7 @@ gtk_tree_view_put (GtkTreeView *tree_view,
const GtkBorder *border)
{
GtkTreeViewChild *child;
-
+
g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
g_return_if_fail (GTK_IS_WIDGET (child_widget));
@@ -8942,7 +8942,7 @@ gtk_tree_view_put (GtkTreeView *tree_view,
if (gtk_widget_get_realized (GTK_WIDGET (tree_view)))
gtk_widget_set_parent_window (child->widget, tree_view->priv->bin_window);
-
+
gtk_widget_set_parent (child_widget, GTK_WIDGET (tree_view));
}
@@ -9308,7 +9308,7 @@ gtk_tree_view_row_deleted (GtkTreeModel *model,
cursor_path = NULL;
if (cursor_path == NULL ||
- ! search_first_focusable_path (tree_view, &cursor_path, TRUE,
+ ! search_first_focusable_path (tree_view, &cursor_path, TRUE,
&cursor_tree, &cursor_node))
{
/* It looks like we reached the end of the view without finding
@@ -9841,7 +9841,7 @@ gtk_tree_view_add_move_binding (GtkBindingSet *binding_set,
GtkMovementStep step,
gint count)
{
-
+
gtk_binding_entry_add_signal (binding_set, keyval, modmask,
"move-cursor", 2,
G_TYPE_ENUM, step,
@@ -9992,7 +9992,7 @@ gtk_tree_view_set_column_drag_info (GtkTreeView *tree_view,
/* We know there are always 2 slots possbile, as you can always return column. */
/* If that's all there is, return */
- if (tree_view->priv->column_drag_info->next == NULL ||
+ if (tree_view->priv->column_drag_info->next == NULL ||
(tree_view->priv->column_drag_info->next->next == NULL &&
((GtkTreeViewColumnReorder *)tree_view->priv->column_drag_info->data)->right_column == column &&
((GtkTreeViewColumnReorder *)tree_view->priv->column_drag_info->next->data)->left_column == column))
@@ -10213,7 +10213,7 @@ _gtk_tree_view_set_anchor_path (GtkTreeView *tree_view,
if (anchor_path && tree_view->priv->model)
tree_view->priv->anchor =
- gtk_tree_row_reference_new_proxy (G_OBJECT (tree_view),
+ gtk_tree_row_reference_new_proxy (G_OBJECT (tree_view),
tree_view->priv->model, anchor_path);
}
@@ -10264,7 +10264,7 @@ _gtk_tree_view_set_focus_column (GtkTreeView *tree_view,
tree_view->priv->focus_column = column;
- _gtk_tree_view_accessible_update_focus_column (tree_view,
+ _gtk_tree_view_accessible_update_focus_column (tree_view,
old_column,
column);
}
@@ -10557,7 +10557,7 @@ gtk_tree_view_move_cursor_up_down (GtkTreeView *tree_view,
}
else
{
- gtk_tree_view_clamp_node_visible (tree_view,
+ gtk_tree_view_clamp_node_visible (tree_view,
tree_view->priv->cursor_tree,
tree_view->priv->cursor_node);
@@ -10952,7 +10952,7 @@ gtk_tree_view_real_select_cursor_row (GtkTreeView *tree_view,
if (!tree_view->priv->extend_selection_pressed)
gtk_tree_view_row_activated (tree_view, cursor_path,
tree_view->priv->focus_column);
-
+
gtk_tree_path_free (cursor_path);
return TRUE;
@@ -11177,7 +11177,7 @@ gtk_tree_view_ensure_interactive_directory (GtkTreeView *tree_view)
return;
}
-
+
tree_view->priv->search_window = gtk_window_new (GTK_WINDOW_POPUP);
gtk_window_set_screen (GTK_WINDOW (tree_view->priv->search_window), screen);
@@ -11240,7 +11240,7 @@ gtk_tree_view_ensure_interactive_directory (GtkTreeView *tree_view)
}
/* Pops up the interactive search entry. If keybinding is TRUE then the user
- * started this by typing the start_interactive_search keybinding. Otherwise, it came from
+ * started this by typing the start_interactive_search keybinding. Otherwise, it came from
*/
static gboolean
gtk_tree_view_real_start_interactive_search (GtkTreeView *tree_view,
@@ -11280,7 +11280,7 @@ gtk_tree_view_real_start_interactive_search (GtkTreeView *tree_view,
break;
}
}
-
+
if (gtk_widget_has_focus (GTK_WIDGET (tree_view)))
found_focus = TRUE;
@@ -11341,7 +11341,7 @@ gtk_tree_view_adjustment_changed (GtkAdjustment *adjustment,
if (gtk_widget_get_realized (GTK_WIDGET (tree_view)))
{
gint dy;
-
+
gdk_window_move (tree_view->priv->bin_window,
- gtk_adjustment_get_value (tree_view->priv->hadjustment),
gtk_tree_view_get_effective_header_height (tree_view));
@@ -11900,11 +11900,11 @@ gtk_tree_view_set_headers_clickable (GtkTreeView *tree_view,
*
* Since: 2.10
**/
-gboolean
+gboolean
gtk_tree_view_get_headers_clickable (GtkTreeView *tree_view)
{
GList *list;
-
+
g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), FALSE);
for (list = tree_view->priv->columns; list; list = list->next)
@@ -12408,11 +12408,11 @@ gtk_tree_view_move_column_after (GtkTreeView *tree_view,
* @tree_view: A #GtkTreeView
* @column: %NULL, or the column to draw the expander arrow at.
*
- * Sets the column to draw the expander arrow at. It must be in @tree_view.
- * If @column is %NULL, then the expander arrow is always at the first
+ * Sets the column to draw the expander arrow at. It must be in @tree_view.
+ * If @column is %NULL, then the expander arrow is always at the first
* visible column.
*
- * If you do not want expander arrow to appear in your tree, set the
+ * If you do not want expander arrow to appear in your tree, set the
* expander column to a hidden column.
**/
void
@@ -13019,7 +13019,7 @@ gtk_tree_view_real_collapse_row (GtkTreeView *tree_view,
}
selection_changed = gtk_tree_view_unref_and_check_selection_tree (tree_view, node->children);
-
+
/* Stop a pending double click */
gtk_event_controller_reset (GTK_EVENT_CONTROLLER (tree_view->priv->multipress_gesture));
@@ -13041,7 +13041,7 @@ gtk_tree_view_real_collapse_row (GtkTreeView *tree_view,
}
g_signal_emit (tree_view, tree_view_signals[ROW_COLLAPSED], 0, &iter, path);
-
+
if (gtk_widget_get_mapped (GTK_WIDGET (tree_view)))
update_prelight (tree_view,
tree_view->priv->event_last_x,
@@ -13262,7 +13262,7 @@ gtk_tree_view_real_set_cursor (GtkTreeView *tree_view,
* path maps to a non-existing path and we will silently bail out.
* We unset tree and node to avoid further processing.
*/
- if (path == NULL ||
+ if (path == NULL ||
row_is_separator (tree_view, NULL, path)
|| _gtk_tree_view_find_node (tree_view,
path,
@@ -13370,11 +13370,11 @@ gtk_tree_view_get_cursor (GtkTreeView *tree_view,
*
* Sets the current keyboard focus to be at @path, and selects it. This is
* useful when you want to focus the user’s attention on a particular row. If
- * @focus_column is not %NULL, then focus is given to the column specified by
- * it. Additionally, if @focus_column is specified, and @start_editing is
- * %TRUE, then editing should be started in the specified cell.
- * This function is often followed by @gtk_widget_grab_focus (@tree_view)
- * in order to give keyboard focus to the widget. Please note that editing
+ * @focus_column is not %NULL, then focus is given to the column specified by
+ * it. Additionally, if @focus_column is specified, and @start_editing is
+ * %TRUE, then editing should be started in the specified cell.
+ * This function is often followed by @gtk_widget_grab_focus (@tree_view)
+ * in order to give keyboard focus to the widget. Please note that editing
* can only happen when the widget is realized.
*
* If @path is invalid for @model, the current cursor (if any) will be unset
@@ -13595,7 +13595,7 @@ gtk_tree_view_get_path_at_pos (GtkTreeView *tree_view,
{
if (column)
*column = last_column;
-
+
if (cell_x)
*cell_x = gtk_tree_view_column_get_width (last_column) + remaining_x;
}
@@ -14084,7 +14084,7 @@ gtk_tree_view_get_visible_range (GtkTreeView *tree_view,
GtkRBTree *tree;
GtkRBNode *node;
gboolean retval;
-
+
g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), FALSE);
if (!tree_view->priv->tree)
@@ -14281,7 +14281,7 @@ gtk_tree_view_enable_model_drag_source (GtkTreeView *tree_view,
* @n_targets: the number of items in @targets
* @actions: the bitmask of possible actions for a drag from this
* widget
- *
+ *
* Turns @tree_view into a drop destination for automatic DND. Calling
* this method sets #GtkTreeView:reorderable to %FALSE.
**/
@@ -14335,7 +14335,7 @@ gtk_tree_view_unset_rows_drag_source (GtkTreeView *tree_view)
if (!di->dest_set && !di->source_set)
remove_info (tree_view);
}
-
+
unset_reorderable (tree_view);
}
@@ -14455,7 +14455,7 @@ gtk_tree_view_set_drag_dest_row (GtkTreeView *tree_view,
* @tree_view: a #GtkTreeView
* @path: (out) (optional) (nullable): Return location for the path of the highlighted row, or %NULL.
* @pos: (out) (optional): Return location for the drop position, or %NULL
- *
+ *
* Gets information about the row that is highlighted for feedback.
**/
void
@@ -14491,12 +14491,12 @@ gtk_tree_view_get_drag_dest_row (GtkTreeView *tree_view,
* the highlighted row, or %NULL.
* @pos: (out) (optional): Return location for the drop position, or
* %NULL
- *
+ *
* Determines the destination row for a given position. @drag_x and
* @drag_y are expected to be in widget coordinates. This function is only
* meaningful if @tree_view is realized. Therefore this function will always
* return %FALSE if @tree_view is not realized or does not have a model.
- *
+ *
* Returns: whether there is a row at the given position, %TRUE if this
* is indeed the case.
**/
@@ -14593,7 +14593,7 @@ gtk_tree_view_get_dest_row_at_pos (GtkTreeView *tree_view,
* @tree_view: a #GtkTreeView
* @path: a #GtkTreePath in @tree_view
*
- * Creates a #cairo_surface_t representation of the row at @path.
+ * Creates a #cairo_surface_t representation of the row at @path.
* This image is used for a drag icon.
*
* Returns: (transfer full): a newly-allocated surface of the drag icon.
@@ -14736,8 +14736,8 @@ gtk_tree_view_create_row_drag_icon (GtkTreeView *tree_view,
}
cairo_set_source_rgb (cr, 0, 0, 0);
- cairo_rectangle (cr,
- 0.5, 0.5,
+ cairo_rectangle (cr,
+ 0.5, 0.5,
bin_window_width + 1,
background_area.height + 1);
cairo_set_line_width (cr, 1.0);
@@ -14792,8 +14792,8 @@ gtk_tree_view_set_destroy_count_func (GtkTreeView *tree_view,
*
* If @enable_search is set, then the user can type in text to search through
* the tree interactively (this is sometimes called "typeahead find").
- *
- * Note that even if this is %FALSE, the user can still initiate a search
+ *
+ * Note that even if this is %FALSE, the user can still initiate a search
* using the “start-interactive-search” key binding.
*/
void
@@ -14803,7 +14803,7 @@ gtk_tree_view_set_enable_search (GtkTreeView *tree_view,
g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
enable_search = !!enable_search;
-
+
if (tree_view->priv->enable_search != enable_search)
{
tree_view->priv->enable_search = enable_search;
@@ -14815,7 +14815,7 @@ gtk_tree_view_set_enable_search (GtkTreeView *tree_view,
* gtk_tree_view_get_enable_search:
* @tree_view: A #GtkTreeView
*
- * Returns whether or not the tree allows to start interactive searching
+ * Returns whether or not the tree allows to start interactive searching
* by typing in text.
*
* Returns: whether or not to let the user search interactively
@@ -14851,13 +14851,13 @@ gtk_tree_view_get_search_column (GtkTreeView *tree_view)
* @column: the column of the model to search in, or -1 to disable searching
*
* Sets @column as the column where the interactive search code should
- * search in for the current model.
- *
+ * search in for the current model.
+ *
* If the search column is set, users can use the “start-interactive-search”
* key binding to bring up search popup. The enable-search property controls
* whether simply typing text will also start an interactive search.
*
- * Note that @column refers to a column of the current model. The search
+ * Note that @column refers to a column of the current model. The search
* column is reset to -1 when the model is changed.
*/
void
@@ -14995,7 +14995,7 @@ gtk_tree_view_set_search_entry (GtkTreeView *tree_view,
G_CALLBACK (gtk_tree_view_search_init),
tree_view);
}
-
+
g_signal_connect (tree_view->priv->search_entry, "key-press-event",
G_CALLBACK (gtk_tree_view_search_key_press_event),
tree_view);
@@ -15077,7 +15077,7 @@ gtk_tree_view_search_window_hide (GtkWidget *search_window,
g_source_remove (tree_view->priv->typeselect_flush_timeout);
tree_view->priv->typeselect_flush_timeout = 0;
}
-
+
if (gtk_widget_get_visible (search_window))
{
/* send focus-in event */
@@ -15187,9 +15187,9 @@ gtk_tree_view_search_activate (GtkEntry *entry,
{
path = _gtk_tree_path_new_from_rbtree (tree_view->priv->cursor_tree,
tree_view->priv->cursor_node);
-
+
gtk_tree_view_row_activated (tree_view, path, tree_view->priv->focus_column);
-
+
gtk_tree_path_free (path);
}
}
@@ -15741,12 +15741,12 @@ gtk_tree_view_stop_editing (GtkTreeView *tree_view,
*
* Enables or disables the hover selection mode of @tree_view.
* Hover selection makes the selected row follow the pointer.
- * Currently, this works only for the selection modes
+ * Currently, this works only for the selection modes
* %GTK_SELECTION_SINGLE and %GTK_SELECTION_BROWSE.
- *
+ *
* Since: 2.6
**/
-void
+void
gtk_tree_view_set_hover_selection (GtkTreeView *tree_view,
gboolean hover)
{
@@ -15763,14 +15763,14 @@ gtk_tree_view_set_hover_selection (GtkTreeView *tree_view,
/**
* gtk_tree_view_get_hover_selection:
* @tree_view: a #GtkTreeView
- *
+ *
* Returns whether hover selection mode is turned on for @tree_view.
- *
+ *
* Returns: %TRUE if @tree_view is in hover selection mode
*
- * Since: 2.6
+ * Since: 2.6
**/
-gboolean
+gboolean
gtk_tree_view_get_hover_selection (GtkTreeView *tree_view)
{
return tree_view->priv->hover_selection;
@@ -15782,12 +15782,12 @@ gtk_tree_view_get_hover_selection (GtkTreeView *tree_view)
* @expand: %TRUE to enable hover selection mode
*
* Enables or disables the hover expansion mode of @tree_view.
- * Hover expansion makes rows expand or collapse if the pointer
+ * Hover expansion makes rows expand or collapse if the pointer
* moves over them.
- *
+ *
* Since: 2.6
**/
-void
+void
gtk_tree_view_set_hover_expand (GtkTreeView *tree_view,
gboolean expand)
{
@@ -15804,14 +15804,14 @@ gtk_tree_view_set_hover_expand (GtkTreeView *tree_view,
/**
* gtk_tree_view_get_hover_expand:
* @tree_view: a #GtkTreeView
- *
+ *
* Returns whether hover expansion mode is turned on for @tree_view.
- *
+ *
* Returns: %TRUE if @tree_view is in hover expansion mode
*
- * Since: 2.6
+ * Since: 2.6
**/
-gboolean
+gboolean
gtk_tree_view_get_hover_expand (GtkTreeView *tree_view)
{
return tree_view->priv->hover_expand;
@@ -15825,7 +15825,7 @@ gtk_tree_view_get_hover_expand (GtkTreeView *tree_view)
* Enables or disables rubber banding in @tree_view. If the selection mode
* is #GTK_SELECTION_MULTIPLE, rubber banding will allow the user to select
* multiple rows by dragging the mouse.
- *
+ *
* Since: 2.10
**/
void
@@ -15845,11 +15845,11 @@ gtk_tree_view_set_rubber_banding (GtkTreeView *tree_view,
/**
* gtk_tree_view_get_rubber_banding:
* @tree_view: a #GtkTreeView
- *
+ *
* Returns whether rubber banding is turned on for @tree_view. If the
* selection mode is #GTK_SELECTION_MULTIPLE, rubber banding will allow the
* user to select multiple rows by dragging the mouse.
- *
+ *
* Returns: %TRUE if rubber banding in @tree_view is enabled.
*
* Since: 2.10
@@ -15863,7 +15863,7 @@ gtk_tree_view_get_rubber_banding (GtkTreeView *tree_view)
/**
* gtk_tree_view_is_rubber_banding_active:
* @tree_view: a #GtkTreeView
- *
+ *
* Returns whether a rubber banding operation is currently being done
* in @tree_view.
*
@@ -15887,14 +15887,14 @@ gtk_tree_view_is_rubber_banding_active (GtkTreeView *tree_view)
/**
* gtk_tree_view_get_row_separator_func: (skip)
* @tree_view: a #GtkTreeView
- *
+ *
* Returns the current row separator function.
- *
+ *
* Returns: the current row separator function.
*
* Since: 2.6
**/
-GtkTreeViewRowSeparatorFunc
+GtkTreeViewRowSeparatorFunc
gtk_tree_view_get_row_separator_func (GtkTreeView *tree_view)
{
g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), NULL);
@@ -15908,7 +15908,7 @@ gtk_tree_view_get_row_separator_func (GtkTreeView *tree_view)
* @func: (allow-none): a #GtkTreeViewRowSeparatorFunc
* @data: (allow-none): user data to pass to @func, or %NULL
* @destroy: (allow-none): destroy notifier for @data, or %NULL
- *
+ *
* Sets the row separator function, which is used to determine
* whether a row should be drawn as a separator. If the row separator
* function is %NULL, no separators are drawn. This is the default value.
@@ -15979,7 +15979,7 @@ gtk_tree_view_set_grid_lines (GtkTreeView *tree_view,
old_grid_lines = priv->grid_lines;
priv->grid_lines = grid_lines;
-
+
if (gtk_widget_get_realized (widget))
{
if (grid_lines == GTK_TREE_VIEW_GRID_LINES_NONE &&
@@ -15987,8 +15987,8 @@ gtk_tree_view_set_grid_lines (GtkTreeView *tree_view,
{
priv->grid_line_width = 0;
}
-
- if (grid_lines != GTK_TREE_VIEW_GRID_LINES_NONE &&
+
+ if (grid_lines != GTK_TREE_VIEW_GRID_LINES_NONE &&
!priv->grid_line_width)
{
gint8 *dash_list;
@@ -15997,13 +15997,13 @@ gtk_tree_view_set_grid_lines (GtkTreeView *tree_view,
"grid-line-width", &priv->grid_line_width,
"grid-line-pattern", (gchar *)&dash_list,
NULL);
-
+
if (dash_list)
{
priv->grid_line_dashes[0] = dash_list[0];
if (dash_list[0])
priv->grid_line_dashes[1] = dash_list[1];
-
+
g_free (dash_list);
}
else
@@ -16011,13 +16011,13 @@ gtk_tree_view_set_grid_lines (GtkTreeView *tree_view,
priv->grid_line_dashes[0] = 1;
priv->grid_line_dashes[1] = 1;
}
- }
+ }
}
if (old_grid_lines != grid_lines)
{
gtk_widget_queue_draw (GTK_WIDGET (tree_view));
-
+
g_object_notify_by_pspec (G_OBJECT (tree_view), tree_view_props[PROP_ENABLE_GRID_LINES]);
}
}
@@ -16076,7 +16076,7 @@ gtk_tree_view_set_enable_tree_lines (GtkTreeView *tree_view,
{
priv->tree_line_width = 0;
}
-
+
if (enabled && !priv->tree_line_width)
{
gint8 *dash_list;
@@ -16084,13 +16084,13 @@ gtk_tree_view_set_enable_tree_lines (GtkTreeView *tree_view,
"tree-line-width", &priv->tree_line_width,
"tree-line-pattern", (gchar *)&dash_list,
NULL);
-
+
if (dash_list)
{
priv->tree_line_dashes[0] = dash_list[0];
if (dash_list[0])
priv->tree_line_dashes[1] = dash_list[1];
-
+
g_free (dash_list);
}
else
diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index 41d3740..09c79d5 100644
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -124,7 +124,7 @@ static void gtk_tree_view_column_set_attributesv (GtkTreeViewColum
static void gtk_tree_view_column_buildable_init (GtkBuildableIface *iface);
-struct _GtkTreeViewColumnPrivate
+struct _GtkTreeViewColumnPrivate
{
GtkWidget *tree_view;
GtkWidget *button;
@@ -231,7 +231,7 @@ gtk_tree_view_column_class_init (GtkTreeViewColumnClass *class)
object_class->dispose = gtk_tree_view_column_dispose;
object_class->set_property = gtk_tree_view_column_set_property;
object_class->get_property = gtk_tree_view_column_get_property;
-
+
tree_column_signals[CLICKED] =
g_signal_new (I_("clicked"),
G_OBJECT_CLASS_TYPE (object_class),
@@ -389,7 +389,7 @@ gtk_tree_view_column_class_init (GtkTreeViewColumnClass *class)
*
* The #GtkCellArea used to layout cell renderers for this column.
*
- * If no area is specified when creating the tree view column with gtk_tree_view_column_new_with_area()
+ * If no area is specified when creating the tree view column with gtk_tree_view_column_new_with_area()
* a horizontally oriented #GtkCellAreaBox will be used.
*
* Since: 3.0
@@ -479,14 +479,14 @@ gtk_tree_view_column_dispose (GObject *object)
GtkTreeViewColumn *tree_column = (GtkTreeViewColumn *) object;
GtkTreeViewColumnPrivate *priv = tree_column->priv;
- /* Remove this column from its treeview,
+ /* Remove this column from its treeview,
* in case this column is destroyed before its treeview.
- */
+ */
if (priv->tree_view)
gtk_tree_view_remove_column (GTK_TREE_VIEW (priv->tree_view), tree_column);
-
+
if (priv->cell_area_context)
- {
+ {
g_signal_handler_disconnect (priv->cell_area_context,
priv->context_changed_signal);
@@ -618,7 +618,7 @@ gtk_tree_view_column_set_property (GObject *object,
gtk_tree_view_column_set_sort_order (tree_column,
g_value_get_enum (value));
break;
-
+
case PROP_SORT_COLUMN_ID:
gtk_tree_view_column_set_sort_column_id (tree_column,
g_value_get_int (value));
@@ -743,7 +743,7 @@ gtk_tree_view_column_get_property (GObject *object,
g_value_set_enum (value,
gtk_tree_view_column_get_sort_order (tree_column));
break;
-
+
case PROP_SORT_COLUMN_ID:
g_value_set_int (value,
gtk_tree_view_column_get_sort_column_id (tree_column));
@@ -752,7 +752,7 @@ gtk_tree_view_column_get_property (GObject *object,
case PROP_CELL_AREA:
g_value_set_object (value, tree_column->priv->cell_area);
break;
-
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -868,7 +868,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
gtk_widget_show (priv->alignment);
}
-static void
+static void
gtk_tree_view_column_update_button (GtkTreeViewColumn *tree_column)
{
GtkTreeViewColumnPrivate *priv = tree_column->priv;
@@ -894,7 +894,7 @@ gtk_tree_view_column_update_button (GtkTreeViewColumn *tree_column)
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gtk_alignment_set (GTK_ALIGNMENT (alignment), priv->xalign, 0.5, 0.0, 0.0);
G_GNUC_END_IGNORE_DEPRECATIONS
-
+
if (priv->child)
{
if (current_child != priv->child)
@@ -905,7 +905,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
priv->child);
}
}
- else
+ else
{
if (current_child == NULL)
{
@@ -1009,7 +1009,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
gdk_window_hide (priv->window);
}
}
-
+
if (priv->reorderable || priv->clickable)
{
gtk_widget_set_can_focus (priv->button, TRUE);
@@ -1059,7 +1059,7 @@ gtk_tree_view_column_button_event (GtkWidget *widget,
if (event->type == GDK_BUTTON_RELEASE ||
event->type == GDK_LEAVE_NOTIFY)
priv->maybe_reordered = FALSE;
-
+
if (event->type == GDK_MOTION_NOTIFY &&
priv->maybe_reordered &&
(gtk_drag_check_threshold (widget,
@@ -1232,7 +1232,7 @@ gtk_tree_view_column_setup_sort_column_id_callback (GtkTreeViewColumn *tree_colu
gtk_tree_view_column_set_sort_indicator (tree_column, TRUE);
gtk_tree_view_column_set_sort_order (tree_column, real_order);
}
- else
+ else
{
gtk_tree_view_column_set_sort_indicator (tree_column, FALSE);
}
@@ -1247,7 +1247,7 @@ gtk_tree_view_column_context_changed (GtkCellAreaContext *context,
/* Here we want the column re-requested if the underlying context was
* actually reset for any reason, this can happen if the underlying
* area/cell configuration changes (i.e. cell packing properties
- * or cell spacing and the like)
+ * or cell spacing and the like)
*
* Note that we block this handler while requesting for sizes
* so there is no need to check for the new context size being -1,
@@ -1276,13 +1276,13 @@ gtk_tree_view_column_add_editable_callback (GtkCellArea *area,
if (priv->tree_view)
{
path = gtk_tree_path_new_from_string (path_string);
-
+
_gtk_tree_view_add_editable (GTK_TREE_VIEW (priv->tree_view),
column,
path,
edit_widget,
cell_area);
-
+
gtk_tree_path_free (path);
}
}
@@ -1559,9 +1559,9 @@ _gtk_tree_view_column_is_blank_at_pos (GtkTreeViewColumn *column,
/**
* gtk_tree_view_column_new:
- *
+ *
* Creates a new #GtkTreeViewColumn.
- *
+ *
* Returns: A newly created #GtkTreeViewColumn.
**/
GtkTreeViewColumn *
@@ -1577,9 +1577,9 @@ gtk_tree_view_column_new (void)
/**
* gtk_tree_view_column_new_with_area:
* @area: the #GtkCellArea that the newly created column should use to layout cells.
- *
+ *
* Creates a new #GtkTreeViewColumn using @area to render its cells.
- *
+ *
* Returns: A newly created #GtkTreeViewColumn.
*
* Since: 3.0
@@ -1613,7 +1613,7 @@ gtk_tree_view_column_new_with_area (GtkCellArea *area)
* {
* GtkTreeViewColumn *column;
* GtkCellRenderer *renderer = gtk_cell_renderer_text_new ();
- *
+ *
* column = gtk_tree_view_column_new_with_attributes ("Title",
* renderer,
* "text", TEXT_COLUMN,
@@ -1621,7 +1621,7 @@ gtk_tree_view_column_new_with_area (GtkCellArea *area)
* NULL);
* }
* ]|
- *
+ *
* Returns: A newly created #GtkTreeViewColumn.
**/
GtkTreeViewColumn *
@@ -1647,7 +1647,7 @@ gtk_tree_view_column_new_with_attributes (const gchar *title,
/**
* gtk_tree_view_column_pack_start:
* @tree_column: A #GtkTreeViewColumn.
- * @cell: The #GtkCellRenderer.
+ * @cell: The #GtkCellRenderer.
* @expand: %TRUE if @cell is to be given extra space allocated to @tree_column.
*
* Packs the @cell into the beginning of the column. If @expand is %FALSE, then
@@ -1665,7 +1665,7 @@ gtk_tree_view_column_pack_start (GtkTreeViewColumn *tree_column,
/**
* gtk_tree_view_column_pack_end:
* @tree_column: A #GtkTreeViewColumn.
- * @cell: The #GtkCellRenderer.
+ * @cell: The #GtkCellRenderer.
* @expand: %TRUE if @cell is to be given extra space allocated to @tree_column.
*
* Adds the @cell to end of the column. If @expand is %FALSE, then the @cell
@@ -1683,7 +1683,7 @@ gtk_tree_view_column_pack_end (GtkTreeViewColumn *tree_column,
/**
* gtk_tree_view_column_clear:
* @tree_column: A #GtkTreeViewColumn
- *
+ *
* Unsets all the mappings on all renderers on the @tree_column.
**/
void
@@ -1698,7 +1698,7 @@ gtk_tree_view_column_clear (GtkTreeViewColumn *tree_column)
* @cell_renderer: the #GtkCellRenderer to set attributes on
* @attribute: An attribute on the renderer
* @column: The column position on the model to get the attribute from.
- *
+ *
* Adds an attribute mapping to the list in @tree_column. The @column is the
* column of the model to get a value from, and the @attribute is the
* parameter on @cell_renderer to be set from the value. So for example
@@ -1729,7 +1729,7 @@ gtk_tree_view_column_set_attributesv (GtkTreeViewColumn *tree_column,
gtk_cell_layout_clear_attributes (GTK_CELL_LAYOUT (priv->cell_area),
cell_renderer);
-
+
while (attribute != NULL)
{
column = va_arg (args, gint);
@@ -1770,10 +1770,10 @@ gtk_tree_view_column_set_attributes (GtkTreeViewColumn *tree_column,
* gtk_tree_view_column_set_cell_data_func:
* @tree_column: A #GtkTreeViewColumn
* @cell_renderer: A #GtkCellRenderer
- * @func: (allow-none): The #GtkTreeCellDataFunc to use.
+ * @func: (allow-none): The #GtkTreeCellDataFunc to use.
* @func_data: (closure): The user data for @func.
* @destroy: The destroy notification for @func_data
- *
+ *
* Sets the #GtkTreeCellDataFunc to use for the column. This
* function is used instead of the standard attributes mapping for
* setting the column value, and should set the value of @tree_column's
@@ -1798,7 +1798,7 @@ gtk_tree_view_column_set_cell_data_func (GtkTreeViewColumn *tree_column,
* gtk_tree_view_column_clear_attributes:
* @tree_column: a #GtkTreeViewColumn
* @cell_renderer: a #GtkCellRenderer to clear the attribute mapping on.
- *
+ *
* Clears all existing attributes previously set with
* gtk_tree_view_column_set_attributes().
**/
@@ -1814,7 +1814,7 @@ gtk_tree_view_column_clear_attributes (GtkTreeViewColumn *tree_column,
* gtk_tree_view_column_set_spacing:
* @tree_column: A #GtkTreeViewColumn.
* @spacing: distance between cell renderers in pixels.
- *
+ *
* Sets the spacing field of @tree_column, which is the number of pixels to
* place between cell renderers packed into it.
**/
@@ -1841,9 +1841,9 @@ gtk_tree_view_column_set_spacing (GtkTreeViewColumn *tree_column,
/**
* gtk_tree_view_column_get_spacing:
* @tree_column: A #GtkTreeViewColumn.
- *
+ *
* Returns the spacing of @tree_column.
- *
+ *
* Returns: the spacing of @tree_column.
**/
gint
@@ -1864,7 +1864,7 @@ gtk_tree_view_column_get_spacing (GtkTreeViewColumn *tree_column)
* gtk_tree_view_column_set_visible:
* @tree_column: A #GtkTreeViewColumn.
* @visible: %TRUE if the @tree_column is visible.
- *
+ *
* Sets the visibility of @tree_column.
*/
void
@@ -1901,9 +1901,9 @@ gtk_tree_view_column_set_visible (GtkTreeViewColumn *tree_column,
/**
* gtk_tree_view_column_get_visible:
* @tree_column: A #GtkTreeViewColumn.
- *
+ *
* Returns %TRUE if @tree_column is visible.
- *
+ *
* Returns: whether the column is visible or not. If it is visible, then
* the tree will show the column.
**/
@@ -1919,7 +1919,7 @@ gtk_tree_view_column_get_visible (GtkTreeViewColumn *tree_column)
* gtk_tree_view_column_set_resizable:
* @tree_column: A #GtkTreeViewColumn
* @resizable: %TRUE, if the column can be resized
- *
+ *
* If @resizable is %TRUE, then the user can explicitly resize the column by
* grabbing the outer edge of the column button. If resizable is %TRUE and
* sizing mode of the column is #GTK_TREE_VIEW_COLUMN_AUTOSIZE, then the sizing
@@ -1952,9 +1952,9 @@ gtk_tree_view_column_set_resizable (GtkTreeViewColumn *tree_column,
/**
* gtk_tree_view_column_get_resizable:
* @tree_column: A #GtkTreeViewColumn
- *
+ *
* Returns %TRUE if the @tree_column can be resized by the end user.
- *
+ *
* Returns: %TRUE, if the @tree_column can be resized.
**/
gboolean
@@ -1970,7 +1970,7 @@ gtk_tree_view_column_get_resizable (GtkTreeViewColumn *tree_column)
* gtk_tree_view_column_set_sizing:
* @tree_column: A #GtkTreeViewColumn.
* @type: The #GtkTreeViewColumnSizing.
- *
+ *
* Sets the growth behavior of @tree_column to @type.
**/
void
@@ -1999,9 +1999,9 @@ gtk_tree_view_column_set_sizing (GtkTreeViewColumn *tree_column,
/**
* gtk_tree_view_column_get_sizing:
* @tree_column: A #GtkTreeViewColumn.
- *
+ *
* Returns the current type of @tree_column.
- *
+ *
* Returns: The type of @tree_column.
**/
GtkTreeViewColumnSizing
@@ -2015,9 +2015,9 @@ gtk_tree_view_column_get_sizing (GtkTreeViewColumn *tree_column)
/**
* gtk_tree_view_column_get_width:
* @tree_column: A #GtkTreeViewColumn.
- *
+ *
* Returns the current size of @tree_column in pixels.
- *
+ *
* Returns: The current width of @tree_column.
**/
gint
@@ -2031,9 +2031,9 @@ gtk_tree_view_column_get_width (GtkTreeViewColumn *tree_column)
/**
* gtk_tree_view_column_get_x_offset:
* @tree_column: A #GtkTreeViewColumn.
- *
+ *
* Returns the current X offset of @tree_column in pixels.
- *
+ *
* Returns: The current X offset of @tree_column.
*
* Since: 3.2
@@ -2201,7 +2201,7 @@ gtk_tree_view_column_get_fixed_width (GtkTreeViewColumn *tree_column)
* gtk_tree_view_column_set_min_width:
* @tree_column: A #GtkTreeViewColumn.
* @min_width: The minimum width of the column in pixels, or -1.
- *
+ *
* Sets the minimum width of the @tree_column. If @min_width is -1, then the
* minimum width is unset.
**/
@@ -2245,10 +2245,10 @@ gtk_tree_view_column_set_min_width (GtkTreeViewColumn *tree_column,
/**
* gtk_tree_view_column_get_min_width:
* @tree_column: A #GtkTreeViewColumn.
- *
+ *
* Returns the minimum width in pixels of the @tree_column, or -1 if no minimum
* width is set.
- *
+ *
* Returns: The minimum width of the @tree_column.
**/
gint
@@ -2263,7 +2263,7 @@ gtk_tree_view_column_get_min_width (GtkTreeViewColumn *tree_column)
* gtk_tree_view_column_set_max_width:
* @tree_column: A #GtkTreeViewColumn.
* @max_width: The maximum width of the column in pixels, or -1.
- *
+ *
* Sets the maximum width of the @tree_column. If @max_width is -1, then the
* maximum width is unset. Note, the column can actually be wider than max
* width if it’s the last column in a view. In this case, the column expands to
@@ -2309,10 +2309,10 @@ gtk_tree_view_column_set_max_width (GtkTreeViewColumn *tree_column,
/**
* gtk_tree_view_column_get_max_width:
* @tree_column: A #GtkTreeViewColumn.
- *
+ *
* Returns the maximum width in pixels of the @tree_column, or -1 if no maximum
* width is set.
- *
+ *
* Returns: The maximum width of the @tree_column.
**/
gint
@@ -2326,7 +2326,7 @@ gtk_tree_view_column_get_max_width (GtkTreeViewColumn *tree_column)
/**
* gtk_tree_view_column_clicked:
* @tree_column: a #GtkTreeViewColumn
- *
+ *
* Emits the “clicked” signal on the column. This function will only work if
* @tree_column is clickable.
**/
@@ -2348,7 +2348,7 @@ gtk_tree_view_column_clicked (GtkTreeViewColumn *tree_column)
* gtk_tree_view_column_set_title:
* @tree_column: A #GtkTreeViewColumn.
* @title: The title of the @tree_column.
- *
+ *
* Sets the title of the @tree_column. If a custom widget has been set, then
* this value is ignored.
**/
@@ -2374,9 +2374,9 @@ gtk_tree_view_column_set_title (GtkTreeViewColumn *tree_column,
/**
* gtk_tree_view_column_get_title:
* @tree_column: A #GtkTreeViewColumn.
- *
+ *
* Returns the title of the widget.
- *
+ *
* Returns: the title of the column. This string should not be
* modified or freed.
**/
@@ -2450,7 +2450,7 @@ gtk_tree_view_column_get_expand (GtkTreeViewColumn *tree_column)
* gtk_tree_view_column_set_clickable:
* @tree_column: A #GtkTreeViewColumn.
* @clickable: %TRUE if the header is active.
- *
+ *
* Sets the header to be active if @clickable is %TRUE. When the header is
* active, then it can take keyboard focus, and can be clicked.
**/
@@ -2476,9 +2476,9 @@ gtk_tree_view_column_set_clickable (GtkTreeViewColumn *tree_column,
/**
* gtk_tree_view_column_get_clickable:
* @tree_column: a #GtkTreeViewColumn
- *
+ *
* Returns %TRUE if the user can click on the header for the column.
- *
+ *
* Returns: %TRUE if user can click the column header.
**/
gboolean
@@ -2541,7 +2541,7 @@ gtk_tree_view_column_get_widget (GtkTreeViewColumn *tree_column)
* gtk_tree_view_column_set_alignment:
* @tree_column: A #GtkTreeViewColumn.
* @xalign: The alignment, which is between [0.0 and 1.0] inclusive.
- *
+ *
* Sets the alignment of the title or custom widget inside the column header.
* The alignment determines its location inside the button -- 0.0 for left, 0.5
* for center, 1.0 for right.
@@ -2569,10 +2569,10 @@ gtk_tree_view_column_set_alignment (GtkTreeViewColumn *tree_column,
/**
* gtk_tree_view_column_get_alignment:
* @tree_column: A #GtkTreeViewColumn.
- *
+ *
* Returns the current x alignment of @tree_column. This value can range
* between 0.0 and 1.0.
- *
+ *
* Returns: The current alignent of @tree_column.
**/
gfloat
@@ -2587,7 +2587,7 @@ gtk_tree_view_column_get_alignment (GtkTreeViewColumn *tree_column)
* gtk_tree_view_column_set_reorderable:
* @tree_column: A #GtkTreeViewColumn
* @reorderable: %TRUE, if the column can be reordered.
- *
+ *
* If @reorderable is %TRUE, then the column can be reordered by the end user
* dragging the header.
**/
@@ -2615,9 +2615,9 @@ gtk_tree_view_column_set_reorderable (GtkTreeViewColumn *tree_column,
/**
* gtk_tree_view_column_get_reorderable:
* @tree_column: A #GtkTreeViewColumn
- *
+ *
* Returns %TRUE if the @tree_column can be reordered by the user.
- *
+ *
* Returns: %TRUE if the @tree_column can be reordered by the user.
**/
gboolean
@@ -2634,7 +2634,7 @@ gtk_tree_view_column_get_reorderable (GtkTreeViewColumn *tree_column)
* @tree_column: a #GtkTreeViewColumn
* @sort_column_id: The @sort_column_id of the model to sort on.
*
- * Sets the logical @sort_column_id that this column sorts on when this column
+ * Sets the logical @sort_column_id that this column sorts on when this column
* is selected for sorting. Doing so makes the column header clickable.
**/
void
@@ -2717,7 +2717,7 @@ gtk_tree_view_column_get_sort_column_id (GtkTreeViewColumn *tree_column)
* the header button indicating the column is sorted. Call
* gtk_tree_view_column_set_sort_order() to change the direction of
* the arrow.
- *
+ *
**/
void
gtk_tree_view_column_set_sort_indicator (GtkTreeViewColumn *tree_column,
@@ -2738,9 +2738,9 @@ gtk_tree_view_column_set_sort_indicator (GtkTreeViewColumn *tree_column,
/**
* gtk_tree_view_column_get_sort_indicator:
* @tree_column: a #GtkTreeViewColumn
- *
+ *
* Gets the value set by gtk_tree_view_column_set_sort_indicator().
- *
+ *
* Returns: whether the sort indicator arrow is displayed
**/
gboolean
@@ -2756,16 +2756,16 @@ gtk_tree_view_column_get_sort_indicator (GtkTreeViewColumn *tree_column)
* @tree_column: a #GtkTreeViewColumn
* @order: sort order that the sort indicator should indicate
*
- * Changes the appearance of the sort indicator.
- *
+ * Changes the appearance of the sort indicator.
+ *
* This does not actually sort the model. Use
* gtk_tree_view_column_set_sort_column_id() if you want automatic sorting
* support. This function is primarily for custom sorting behavior, and should
* be used in conjunction with gtk_tree_sortable_set_sort_column_id() to do
- * that. For custom models, the mechanism will vary.
- *
+ * that. For custom models, the mechanism will vary.
+ *
* The sort indicator changes direction to indicate normal sort or reverse sort.
- * Note that you must have the sort indicator enabled to see anything when
+ * Note that you must have the sort indicator enabled to see anything when
* calling this function; see gtk_tree_view_column_set_sort_indicator().
**/
void
@@ -2785,9 +2785,9 @@ gtk_tree_view_column_set_sort_order (GtkTreeViewColumn *tree_column,
/**
* gtk_tree_view_column_get_sort_order:
* @tree_column: a #GtkTreeViewColumn
- *
+ *
* Gets the value set by gtk_tree_view_column_set_sort_order().
- *
+ *
* Returns: the sort order the sort indicator is indicating
**/
GtkSortType
@@ -2805,7 +2805,7 @@ gtk_tree_view_column_get_sort_order (GtkTreeViewColumn *tree_column)
* @iter: The #GtkTreeIter to to get the cell renderer’s attributes from.
* @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 @iter. That is, for
* every attribute mapping in @tree_column, it will get a value from the set
* column on the @iter, and use that value to set the attribute on the cell
@@ -2835,7 +2835,7 @@ gtk_tree_view_column_cell_set_cell_data (GtkTreeViewColumn *tree_column,
* @y_offset: (out) (optional): location to return y offset of a cell relative to @cell_area, or %NULL
* @width: (out) (optional): location to return width needed to render a cell, or %NULL
* @height: (out) (optional): location to return height needed to render a cell, or %NULL
- *
+ *
* Obtains the width and height needed to render the column. This is used
* primarily by the #GtkTreeView.
**/
@@ -2854,7 +2854,7 @@ gtk_tree_view_column_cell_get_size (GtkTreeViewColumn *tree_column,
priv = tree_column->priv;
- g_signal_handler_block (priv->cell_area_context,
+ g_signal_handler_block (priv->cell_area_context,
priv->context_changed_signal);
gtk_cell_area_get_preferred_width (priv->cell_area,
@@ -2871,7 +2871,7 @@ gtk_tree_view_column_cell_get_size (GtkTreeViewColumn *tree_column,
&min_height,
NULL);
- g_signal_handler_unblock (priv->cell_area_context,
+ g_signal_handler_unblock (priv->cell_area_context,
priv->context_changed_signal);
@@ -2889,7 +2889,7 @@ gtk_tree_view_column_cell_get_size (GtkTreeViewColumn *tree_column,
* @background_area: entire cell area (including tree expanders and maybe padding on the sides)
* @cell_area: area normally rendered by a cell renderer
* @flags: flags that affect rendering
- *
+ *
* Renders the cell contained by #tree_column. This is used primarily by the
* #GtkTreeView.
**/
@@ -2943,11 +2943,11 @@ _gtk_tree_view_column_cell_event (GtkTreeViewColumn *tree_column,
/**
* gtk_tree_view_column_cell_is_visible:
* @tree_column: A #GtkTreeViewColumn
- *
+ *
* Returns %TRUE if any of the cells packed into the @tree_column are visible.
* For this to be meaningful, you must first initialize the cells with
* gtk_tree_view_column_cell_set_cell_data()
- *
+ *
* Returns: %TRUE, if any of the cells packed into the @tree_column are currently visible
**/
gboolean
@@ -3009,10 +3009,10 @@ _gtk_tree_view_column_cell_set_dirty (GtkTreeViewColumn *tree_column,
/* Issue a manual reset on the context to have all
* sizes re-requested for the context.
*/
- g_signal_handler_block (priv->cell_area_context,
+ g_signal_handler_block (priv->cell_area_context,
priv->context_changed_signal);
gtk_cell_area_context_reset (priv->cell_area_context);
- g_signal_handler_unblock (priv->cell_area_context,
+ g_signal_handler_unblock (priv->cell_area_context,
priv->context_changed_signal);
if (priv->tree_view &&
@@ -3041,7 +3041,7 @@ _gtk_tree_view_column_cell_get_dirty (GtkTreeViewColumn *tree_column)
* Obtains the horizontal position and size of a cell in a column. If the
* cell is not found in the column, @start_pos and @width are not changed and
* %FALSE is returned.
- *
+ *
* Returns: %TRUE if @cell belongs to @tree_column.
*/
gboolean
diff --git a/gtk/meson.build b/gtk/meson.build
index 394a108..5861036 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -371,12 +371,12 @@ gtk_private_type_headers = files([
'gtktexthandleprivate.h',
])
-gtk_private_h_sources = gtk_private_type_headers + files([
+gtk_private_headers = gtk_private_type_headers + files([
'gtkrecentchooserutils.h',
'gtkrbtree.h',
])
-gtk_public_h_sources = files([
+gtk_public_headers = files([
'gtk.h',
'gtk-autocleanups.h',
'gtkx.h',
@@ -569,6 +569,7 @@ gtk_public_h_sources = files([
'gtktextchild.h',
'gtktextdisplay.h',
'gtktextiter.h',
+ 'gtktextlayout.h',
'gtktextmark.h',
'gtktexttag.h',
'gtktexttagtable.h',
@@ -600,49 +601,6 @@ gtk_public_h_sources = files([
'gtkwindowgroup.h',
])
-gtk_deprecated_type_headers = files([
- 'deprecated/gtkactivatable.h',
- 'deprecated/gtkaction.h',
- 'deprecated/gtkactiongroup.h',
- 'deprecated/gtkalignment.h',
- 'deprecated/gtkarrow.h',
- 'deprecated/gtkcolorsel.h',
- 'deprecated/gtkcolorseldialog.h',
- 'deprecated/gtkfontsel.h',
- 'deprecated/gtkgradient.h',
- 'deprecated/gtkhandlebox.h',
- 'deprecated/gtkhbbox.h',
- 'deprecated/gtkhbox.h',
- 'deprecated/gtkhpaned.h',
- 'deprecated/gtkhscale.h',
- 'deprecated/gtkhscrollbar.h',
- 'deprecated/gtkhseparator.h',
- 'deprecated/gtkhsv.h',
- 'deprecated/gtkiconfactory.h',
- 'deprecated/gtkimagemenuitem.h',
- 'deprecated/gtkmisc.h',
- 'deprecated/gtknumerableicon.h',
- 'deprecated/gtkradioaction.h',
- 'deprecated/gtkrc.h',
- 'deprecated/gtkrecentaction.h',
- 'deprecated/gtkstatusicon.h',
- 'deprecated/gtkstock.h',
- 'deprecated/gtkstyle.h',
- 'deprecated/gtkstyleproperties.h',
- 'deprecated/gtksymboliccolor.h',
- 'deprecated/gtktable.h',
- 'deprecated/gtktearoffmenuitem.h',
- 'deprecated/gtkthemingengine.h',
- 'deprecated/gtktoggleaction.h',
- 'deprecated/gtkuimanager.h',
- 'deprecated/gtkvbbox.h',
- 'deprecated/gtkvbox.h',
- 'deprecated/gtkvscale.h',
- 'deprecated/gtkvscrollbar.h',
- 'deprecated/gtkvseparator.h',
- 'deprecated/gtkvpaned.h',
-])
-
gtk_unix_sources = files([
'gtkcustompaperunixdialog.c',
'gtkpagesetupunixdialog.c',
@@ -705,19 +663,19 @@ gtkmarshal_c = custom_target(
command : [mkmarshal, glib_marshal, '_gtk_marshal', '@INPUT@', '@OUTPUT@']
)
-
-
gtktypebuiltins_h = custom_target(
'gtkypebuiltins_h',
output : 'gtktypebuiltins.h',
- input : gtk_public_h_sources + gtk_deprecated_type_headers,
- command : [mkenum, perl, glib_mkenums, meson.current_source_dir() + '/gtktypebuiltins.h.template',
'@OUTPUT@', '@INPUT@']
+ input : gtk_public_headers + gtk_deprecated_headers,
+ command : [mkenum, perl, glib_mkenums, meson.current_source_dir() + '/gtktypebuiltins.h.template',
'@OUTPUT@', '@INPUT@'],
+ install: true,
+ install_dir: 'include/gtk-3.0/gtk/' # XXX ???
)
gtktypebuiltins_c = custom_target(
'gtkypebuiltins_c',
output : 'gtktypebuiltins.c',
- input : gtk_public_h_sources + gtk_deprecated_type_headers,
+ input : gtk_public_headers + gtk_deprecated_headers,
depends : gtktypebuiltins_h,
command : [mkenum, perl, glib_mkenums, meson.current_source_dir() + '/gtktypebuiltins.c.template',
'@OUTPUT@', '@INPUT@']
)
@@ -743,7 +701,7 @@ typefuncs = custom_target(
'typefuncs',
depends: gdkenum_h,
output : 'gtktypefuncs.c',
- input : gdk_headers + gtk_public_h_sources + gtk_deprecated_type_headers + gtk_private_h_sources +
[gtktypebuiltins_h] + [gdkenum_h],
+ input : gdk_headers + gtk_public_headers + gtk_deprecated_headers + gtk_private_headers +
[gtktypebuiltins_h] + [gdkenum_h],
command: [gentypefuncs_prog, '@OUTPUT@', '@INPUT@'],
install: false,
)
@@ -758,7 +716,8 @@ cdata.set('GTK_INTERFACE_AGE', gtk_interface_age)
gtkversion = configure_file(
input : 'gtkversion.h.in',
output : 'gtkversion.h',
- configuration: cdata
+ configuration: cdata,
+ install_dir: 'include/gtk-3.0/gtk/' # XXX ???
)
gtk_cargs = [
@@ -775,7 +734,7 @@ gtk_cargs = [
gtk_sources += [
gtk_dbus_src,
gtk_unix_sources,
- gtk_deprecated_c_sources,
+ gtk_deprecated_sources,
dnd_sources,
inspector_sources,
a11y_sources,
@@ -809,29 +768,32 @@ if x11_enabled
error('Could not get x11 data prefix via pkg-config.')
endif
- gtk_sources += [
- gtk_x11_sources,
- gtk_use_wayland_or_x11_c_sources
- ]
+ gtk_sources += gtk_x11_sources
gtk_deps += [
xi_dep,
x11_dep,
- pangoft_dep
]
endif
if wayland_enabled
- gtk_sources += [
- gtk_wayland_sources,
- gtk_use_wayland_or_x11_c_sources
- ]
- gtk_deps += [
- pangoft_dep
- ]
+ gtk_sources += gtk_wayland_sources
+endif
+
+# So we don't add these twice
+if x11_enabled or wayland_enabled
+ gtk_sources += gtk_use_wayland_or_x11_c_sources
+ gtk_deps += pangoft_dep
endif
gnome.compile_schemas()
+
+# Install necessary headers
+
+install_headers(gtk_public_headers, subdir: 'gtk-3.0/gtk/')
+install_headers(gtk_deprecated_headers, subdir: 'gtk-3.0/gtk/deprecated/')
+install_headers(a11y_headers, subdir: 'gtk-3.0/gtk/a11y/')
+
libgtk = shared_library('gtk',
gtk_sources,
gtkmarshal_h,
diff --git a/meson.build b/meson.build
index e3d9ec4..4fcf49c 100644
--- a/meson.build
+++ b/meson.build
@@ -260,7 +260,7 @@ configure_file(
subdir('gdk')
subdir('gtk')
-subdir('demos')
-subdir('tests')
-subdir('testsuite')
-subdir('examples')
+# subdir('demos')
+# subdir('tests')
+# subdir('testsuite')
+# subdir('examples')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
