filechooserbutton: Do not propagate state from the dialog unless it is active

[~andy/gtk] / gtk / gtktreedatalist.h

diff --git a/gtk/gtktreedatalist.h b/gtk/gtktreedatalist.h
index d5708f06d24c6ba8dee9f7bca3f4cd1f9a5fd951..85e56219e469b88e2dc7ee8569f60e1f2505692d 100644 (file)
--- a/gtk/gtktreedatalist.h
+++ b/gtk/gtktreedatalist.h
@@ -12,18 +12,14 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #ifndef __GTK_TREE_DATA_LIST_H__
 #define __GTK_TREE_DATA_LIST_H__
 
-#include <glib.h>
-#include <glib-object.h>
-#include "gtktreesortable.h"
+#include <gtk/gtktreemodel.h>
+#include <gtk/gtktreesortable.h>
 
 typedef struct _GtkTreeDataList GtkTreeDataList;
 struct _GtkTreeDataList
@@ -50,7 +46,7 @@ typedef struct _GtkTreeDataSortHeader
   gint sort_column_id;
   GtkTreeIterCompareFunc func;
   gpointer data;
-  GtkDestroyNotify destroy;
+  GDestroyNotify destroy;
 } GtkTreeDataSortHeader;
 
 GtkTreeDataList *_gtk_tree_data_list_alloc          (void);
@@ -67,15 +63,19 @@ GtkTreeDataList *_gtk_tree_data_list_node_copy      (GtkTreeDataList *list,
                                                      GType            type);
 
 /* Header code */
-gint                   gtk_tree_data_list_compare_func (GtkTreeModel *model,
-                                                       GtkTreeIter  *a,
-                                                       GtkTreeIter  *b,
-                                                       gpointer      user_data);
+gint                   _gtk_tree_data_list_compare_func (GtkTreeModel *model,
+                                                        GtkTreeIter  *a,
+                                                        GtkTreeIter  *b,
+                                                        gpointer      user_data);
 GList *                _gtk_tree_data_list_header_new  (gint          n_columns,
                                                        GType        *types);
 void                   _gtk_tree_data_list_header_free (GList        *header_list);
 GtkTreeDataSortHeader *_gtk_tree_data_list_get_header  (GList        *header_list,
                                                        gint          sort_column_id);
-
+GList                 *_gtk_tree_data_list_set_header  (GList                  *header_list,
+                                                       gint                    sort_column_id,
+                                                       GtkTreeIterCompareFunc  func,
+                                                       gpointer                data,
+                                                       GDestroyNotify          destroy);
 
 #endif /* __GTK_TREE_DATA_LIST_H__ */