diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2010-05-06 22:55:02 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2010-05-06 22:55:02 -0400 |
| commit | 77d4d3cdae0739c0a5643fb23891f8790f05c074 (patch) | |
| tree | ebd134deb99ffd0ef47aea63e3dfcea73bd625f5 /gtk/gtktreemodel.h | |
| parent | b3e0e25d65db6b7be3385663ceeaecdc5c3115df (diff) | |
| parent | 0de8601327d541f644dc1882c99f44551870a7ab (diff) | |
| download | gtk+-77d4d3cdae0739c0a5643fb23891f8790f05c074.tar.gz | |
Merge branch 'gtk-2-90'
Conflicts:
gtk/gtkentry.h
Diffstat (limited to 'gtk/gtktreemodel.h')
| -rw-r--r-- | gtk/gtktreemodel.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/gtk/gtktreemodel.h b/gtk/gtktreemodel.h index ba0fe4ef3e..e7f59c672b 100644 --- a/gtk/gtktreemodel.h +++ b/gtk/gtktreemodel.h @@ -17,7 +17,7 @@ * Boston, MA 02111-1307, USA. */ -#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) #error "Only <gtk/gtk.h> can be included directly." #endif @@ -153,10 +153,6 @@ gboolean gtk_tree_path_is_ancestor (GtkTreePath *path, gboolean gtk_tree_path_is_descendant (GtkTreePath *path, GtkTreePath *ancestor); -#ifndef GTK_DISABLE_DEPRECATED -#define gtk_tree_path_new_root() gtk_tree_path_new_first() -#endif /* !GTK_DISABLE_DEPRECATED */ - /* Row reference (an object that tracks model changes so it refers to the same * row always; a path refers to a position, not a fixed row). You almost always * want to call gtk_tree_row_reference_new. @@ -245,11 +241,6 @@ void gtk_tree_model_foreach (GtkTreeModel *model GtkTreeModelForeachFunc func, gpointer user_data); - -#ifndef GTK_DISABLE_DEPRECATED -#define gtk_tree_model_get_iter_root(tree_model, iter) gtk_tree_model_get_iter_first(tree_model, iter) -#endif /* !GTK_DISABLE_DEPRECATED */ - /* Signals */ void gtk_tree_model_row_changed (GtkTreeModel *tree_model, GtkTreePath *path, |