X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkliststore.h;h=1e61d5aba4b613db723be8f5e9434e0bbd42e4df;hb=e4c2ef108cc66210af015b679ce3542ca6decfec;hp=d653acf223ff6efdb38536fc85b35796f9c38c85;hpb=b69987f217595e1d2a01ef65628c2fff701b91c1;p=~andy%2Fgtk
diff --git a/gtk/gtkliststore.h b/gtk/gtkliststore.h
index d653acf22..1e61d5aba 100644
--- a/gtk/gtkliststore.h
+++ b/gtk/gtkliststore.h
@@ -12,20 +12,22 @@
* 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 .
*/
#ifndef __GTK_LIST_STORE_H__
#define __GTK_LIST_STORE_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only can be included directly."
+#endif
+
#include
#include
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+
+G_BEGIN_DECLS
+
#define GTK_TYPE_LIST_STORE (gtk_list_store_get_type ())
#define GTK_LIST_STORE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_LIST_STORE, GtkListStore))
@@ -34,27 +36,16 @@ extern "C" {
#define GTK_IS_LIST_STORE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_LIST_STORE))
#define GTK_LIST_STORE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_LIST_STORE, GtkListStoreClass))
-typedef struct _GtkListStore GtkListStore;
-typedef struct _GtkListStoreClass GtkListStoreClass;
+typedef struct _GtkListStore GtkListStore;
+typedef struct _GtkListStorePrivate GtkListStorePrivate;
+typedef struct _GtkListStoreClass GtkListStoreClass;
struct _GtkListStore
{
GObject parent;
/*< private >*/
- gint stamp;
- gpointer seq; /* head of the list */
- gpointer _gtk_reserved1;
- GList *sort_list;
- gint n_columns;
- gint sort_column_id;
- GtkSortType order;
- GType *column_headers;
- gint length;
- GtkTreeIterCompareFunc default_sort_func;
- gpointer default_sort_data;
- GtkDestroyNotify default_sort_destroy;
- guint columns_dirty : 1;
+ GtkListStorePrivate *priv;
};
struct _GtkListStoreClass
@@ -87,6 +78,11 @@ void gtk_list_store_set_value (GtkListStore *list_store,
void gtk_list_store_set (GtkListStore *list_store,
GtkTreeIter *iter,
...);
+void gtk_list_store_set_valuesv (GtkListStore *list_store,
+ GtkTreeIter *iter,
+ gint *columns,
+ GValue *values,
+ gint n_values);
void gtk_list_store_set_valist (GtkListStore *list_store,
GtkTreeIter *iter,
va_list var_args);
@@ -101,6 +97,16 @@ void gtk_list_store_insert_before (GtkListStore *list_store,
void gtk_list_store_insert_after (GtkListStore *list_store,
GtkTreeIter *iter,
GtkTreeIter *sibling);
+void gtk_list_store_insert_with_values (GtkListStore *list_store,
+ GtkTreeIter *iter,
+ gint position,
+ ...);
+void gtk_list_store_insert_with_valuesv (GtkListStore *list_store,
+ GtkTreeIter *iter,
+ gint position,
+ gint *columns,
+ GValue *values,
+ gint n_values);
void gtk_list_store_prepend (GtkListStore *list_store,
GtkTreeIter *iter);
void gtk_list_store_append (GtkListStore *list_store,
@@ -121,9 +127,7 @@ void gtk_list_store_move_before (GtkListStore *store,
GtkTreeIter *position);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
#endif /* __GTK_LIST_STORE_H__ */