summaryrefslogtreecommitdiff
path: root/gtk/gtkctree.c
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2001-11-17 23:28:51 +0000
committerOwen Taylor <otaylor@src.gnome.org>2001-11-17 23:28:51 +0000
commita036c6e59f27ce53950c64a7672fa2cf51b21f19 (patch)
tree0518e9cea97df1e5d4aeca65be4d2ccc95a5447d /gtk/gtkctree.c
parent3a3468024984ecb9617af5422c76e5a57240c9d0 (diff)
downloadgtk+-a036c6e59f27ce53950c64a7672fa2cf51b21f19.tar.gz
Make gtkmarshal.list/gtkmarshal.h only for compatibility with GTK+-1.2;
Sat Nov 17 18:26:45 2001 Owen Taylor <otaylor@redhat.com> * gtk/Makefile.am gtk/gtkmarshal.list gtk/gtkmarshalers.list gtk/*.c gtk/gtksignal.h: Make gtkmarshal.list/gtkmarshal.h only for compatibility with GTK+-1.2; and deprecate it; put all marshalers we actually use into gtkmarshalers.list and use the _gtk_marshal_ prefix for these marshalers.
Diffstat (limited to 'gtk/gtkctree.c')
-rw-r--r--gtk/gtkctree.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/gtk/gtkctree.c b/gtk/gtkctree.c
index a52175d5fc..9e5c6a33c9 100644
--- a/gtk/gtkctree.c
+++ b/gtk/gtkctree.c
@@ -32,6 +32,7 @@
#include "gtkctree.h"
#include "gtkbindings.h"
#include "gtkmain.h"
+#include "gtkmarshalers.h"
#include "gtkdnd.h"
#include <gdk/gdkkeysyms.h>
@@ -432,7 +433,7 @@ gtk_ctree_class_init (GtkCTreeClass *klass)
GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_select_row),
- gtk_marshal_VOID__POINTER_INT,
+ _gtk_marshal_VOID__POINTER_INT,
GTK_TYPE_NONE, 2,
GTK_TYPE_CTREE_NODE,
GTK_TYPE_INT);
@@ -441,7 +442,7 @@ gtk_ctree_class_init (GtkCTreeClass *klass)
GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_unselect_row),
- gtk_marshal_VOID__POINTER_INT,
+ _gtk_marshal_VOID__POINTER_INT,
GTK_TYPE_NONE, 2,
GTK_TYPE_CTREE_NODE,
GTK_TYPE_INT);
@@ -450,7 +451,7 @@ gtk_ctree_class_init (GtkCTreeClass *klass)
GTK_RUN_LAST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_expand),
- gtk_marshal_VOID__POINTER,
+ _gtk_marshal_VOID__POINTER,
GTK_TYPE_NONE, 1,
GTK_TYPE_CTREE_NODE);
ctree_signals[TREE_COLLAPSE] =
@@ -458,7 +459,7 @@ gtk_ctree_class_init (GtkCTreeClass *klass)
GTK_RUN_LAST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_collapse),
- gtk_marshal_VOID__POINTER,
+ _gtk_marshal_VOID__POINTER,
GTK_TYPE_NONE, 1,
GTK_TYPE_CTREE_NODE);
ctree_signals[TREE_MOVE] =
@@ -466,7 +467,7 @@ gtk_ctree_class_init (GtkCTreeClass *klass)
GTK_RUN_LAST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_move),
- gtk_marshal_VOID__POINTER_POINTER_POINTER,
+ _gtk_marshal_VOID__POINTER_POINTER_POINTER,
GTK_TYPE_NONE, 3,
GTK_TYPE_CTREE_NODE,
GTK_TYPE_CTREE_NODE,
@@ -477,7 +478,7 @@ gtk_ctree_class_init (GtkCTreeClass *klass)
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkCTreeClass,
change_focus_row_expansion),
- gtk_marshal_VOID__ENUM,
+ _gtk_marshal_VOID__ENUM,
GTK_TYPE_NONE, 1, GTK_TYPE_CTREE_EXPANSION_TYPE);
binding_set = gtk_binding_set_by_class (klass);