get rid of the deprecated aliases NONE and BOOL.

2008-08-13  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkmarshalers.list: get rid of the deprecated aliases NONE
	and BOOL.

	* gtk/gtkdialog.c
	* gtk/gtkentrycompletion.c
	* gtk/gtkmenuitem.c
	* gtk/gtkoldeditable.c
	* gtk/gtkrange.c
	* gtk/gtktreeview.c
	* gtk/gtkwidget.c: changed accordingly.


svn path=/trunk/; revision=21111
This commit is contained in:
Michael Natterer 2008-08-13 18:44:11 +00:00 committed by Michael Natterer
parent 0d1dd5e059
commit e0bbf16989
9 changed files with 40 additions and 34 deletions

View File

@ -1,3 +1,16 @@
2008-08-13 Michael Natterer <mitch@imendio.com>
* gtk/gtkmarshalers.list: get rid of the deprecated aliases NONE
and BOOL.
* gtk/gtkdialog.c
* gtk/gtkentrycompletion.c
* gtk/gtkmenuitem.c
* gtk/gtkoldeditable.c
* gtk/gtkrange.c
* gtk/gtktreeview.c
* gtk/gtkwidget.c: changed accordingly.
2008-08-13 Erwann Chenede - <erwann.chenede@sun.com>
Bug 547456 - gdk/x11/gdkscreen-x11.c : init_solaris_xinerama

View File

@ -162,7 +162,7 @@ gtk_dialog_class_init (GtkDialogClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkDialogClass, response),
NULL, NULL,
_gtk_marshal_NONE__INT,
_gtk_marshal_VOID__INT,
G_TYPE_NONE, 1,
G_TYPE_INT);
@ -182,7 +182,7 @@ gtk_dialog_class_init (GtkDialogClass *class)
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkDialogClass, close),
NULL, NULL,
_gtk_marshal_NONE__NONE,
_gtk_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gtk_widget_class_install_style_property (widget_class,

View File

@ -269,7 +269,7 @@ gtk_entry_completion_class_init (GtkEntryCompletionClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkEntryCompletionClass, action_activated),
NULL, NULL,
_gtk_marshal_NONE__INT,
_gtk_marshal_VOID__INT,
G_TYPE_NONE, 1,
G_TYPE_INT);

View File

@ -43,19 +43,11 @@ BOOLEAN:INT,INT,BOOLEAN,OBJECT
BOOLEAN:UINT
BOOLEAN:VOID
BOOLEAN:BOOLEAN
BOOLEAN:NONE
BOOLEAN:BOOLEAN,BOOLEAN,BOOLEAN
BOOLEAN:STRING
ENUM:ENUM
ENUM:VOID
INT:POINTER
NONE:BOOLEAN
NONE:ENUM
NONE:INT
NONE:INT,BOOL
NONE:INT,INT
NONE:NONE
NONE:STRING,INT,POINTER
OBJECT:VOID
STRING:DOUBLE
VOID:DOUBLE
@ -77,6 +69,7 @@ VOID:ENUM,FLOAT,BOOLEAN
VOID:ENUM,INT
VOID:ENUM,INT,BOOLEAN
VOID:INT
VOID:INT,BOOLEAN
VOID:INT,INT
VOID:INT,INT,BOXED
VOID:INT,INT,INT

View File

@ -187,7 +187,7 @@ gtk_menu_item_class_init (GtkMenuItemClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GtkMenuItemClass, toggle_size_allocate),
NULL, NULL,
_gtk_marshal_NONE__INT,
_gtk_marshal_VOID__INT,
G_TYPE_NONE, 1,
G_TYPE_INT);

View File

@ -181,7 +181,7 @@ gtk_old_editable_class_init (GtkOldEditableClass *class)
GTK_RUN_LAST | GTK_RUN_ACTION,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkOldEditableClass, activate),
_gtk_marshal_NONE__NONE,
_gtk_marshal_VOID__VOID,
GTK_TYPE_NONE, 0);
widget_class->activate_signal = editable_signals[ACTIVATE];
@ -190,7 +190,7 @@ gtk_old_editable_class_init (GtkOldEditableClass *class)
GTK_RUN_LAST | GTK_RUN_ACTION,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkOldEditableClass, set_editable),
_gtk_marshal_NONE__BOOLEAN,
_gtk_marshal_VOID__BOOLEAN,
GTK_TYPE_NONE, 1,
GTK_TYPE_BOOL);
@ -199,7 +199,7 @@ gtk_old_editable_class_init (GtkOldEditableClass *class)
GTK_RUN_LAST | GTK_RUN_ACTION,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkOldEditableClass, move_cursor),
_gtk_marshal_NONE__INT_INT,
_gtk_marshal_VOID__INT_INT,
GTK_TYPE_NONE, 2,
GTK_TYPE_INT,
GTK_TYPE_INT);
@ -209,7 +209,7 @@ gtk_old_editable_class_init (GtkOldEditableClass *class)
GTK_RUN_LAST | GTK_RUN_ACTION,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkOldEditableClass, move_word),
_gtk_marshal_NONE__INT,
_gtk_marshal_VOID__INT,
GTK_TYPE_NONE, 1,
GTK_TYPE_INT);
@ -218,7 +218,7 @@ gtk_old_editable_class_init (GtkOldEditableClass *class)
GTK_RUN_LAST | GTK_RUN_ACTION,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkOldEditableClass, move_page),
_gtk_marshal_NONE__INT_INT,
_gtk_marshal_VOID__INT_INT,
GTK_TYPE_NONE, 2,
GTK_TYPE_INT,
GTK_TYPE_INT);
@ -228,7 +228,7 @@ gtk_old_editable_class_init (GtkOldEditableClass *class)
GTK_RUN_LAST | GTK_RUN_ACTION,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkOldEditableClass, move_to_row),
_gtk_marshal_NONE__INT,
_gtk_marshal_VOID__INT,
GTK_TYPE_NONE, 1,
GTK_TYPE_INT);
@ -237,7 +237,7 @@ gtk_old_editable_class_init (GtkOldEditableClass *class)
GTK_RUN_LAST | GTK_RUN_ACTION,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkOldEditableClass, move_to_column),
_gtk_marshal_NONE__INT,
_gtk_marshal_VOID__INT,
GTK_TYPE_NONE, 1,
GTK_TYPE_INT);
@ -246,7 +246,7 @@ gtk_old_editable_class_init (GtkOldEditableClass *class)
GTK_RUN_LAST | GTK_RUN_ACTION,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkOldEditableClass, kill_char),
_gtk_marshal_NONE__INT,
_gtk_marshal_VOID__INT,
GTK_TYPE_NONE, 1,
GTK_TYPE_INT);
@ -255,7 +255,7 @@ gtk_old_editable_class_init (GtkOldEditableClass *class)
GTK_RUN_LAST | GTK_RUN_ACTION,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkOldEditableClass, kill_word),
_gtk_marshal_NONE__INT,
_gtk_marshal_VOID__INT,
GTK_TYPE_NONE, 1,
GTK_TYPE_INT);
@ -264,7 +264,7 @@ gtk_old_editable_class_init (GtkOldEditableClass *class)
GTK_RUN_LAST | GTK_RUN_ACTION,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkOldEditableClass, kill_line),
_gtk_marshal_NONE__INT,
_gtk_marshal_VOID__INT,
GTK_TYPE_NONE, 1,
GTK_TYPE_INT);
@ -273,7 +273,7 @@ gtk_old_editable_class_init (GtkOldEditableClass *class)
GTK_RUN_LAST | GTK_RUN_ACTION,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkOldEditableClass, cut_clipboard),
_gtk_marshal_NONE__NONE,
_gtk_marshal_VOID__VOID,
GTK_TYPE_NONE, 0);
editable_signals[COPY_CLIPBOARD] =
@ -281,7 +281,7 @@ gtk_old_editable_class_init (GtkOldEditableClass *class)
GTK_RUN_LAST | GTK_RUN_ACTION,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkOldEditableClass, copy_clipboard),
_gtk_marshal_NONE__NONE,
_gtk_marshal_VOID__VOID,
GTK_TYPE_NONE, 0);
editable_signals[PASTE_CLIPBOARD] =
@ -289,7 +289,7 @@ gtk_old_editable_class_init (GtkOldEditableClass *class)
GTK_RUN_LAST | GTK_RUN_ACTION,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkOldEditableClass, paste_clipboard),
_gtk_marshal_NONE__NONE,
_gtk_marshal_VOID__VOID,
GTK_TYPE_NONE, 0);
gtk_object_add_arg_type ("GtkOldEditable::text-position", GTK_TYPE_INT, GTK_ARG_READWRITE | G_PARAM_STATIC_NAME, ARG_TEXT_POSITION);

View File

@ -264,7 +264,7 @@ gtk_range_class_init (GtkRangeClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkRangeClass, value_changed),
NULL, NULL,
_gtk_marshal_NONE__NONE,
_gtk_marshal_VOID__VOID,
G_TYPE_NONE, 0);
signals[ADJUST_BOUNDS] =

View File

@ -1000,7 +1000,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkTreeViewClass, columns_changed),
NULL, NULL,
_gtk_marshal_NONE__NONE,
_gtk_marshal_VOID__VOID,
G_TYPE_NONE, 0);
/**
@ -1015,7 +1015,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkTreeViewClass, cursor_changed),
NULL, NULL,
_gtk_marshal_NONE__NONE,
_gtk_marshal_VOID__VOID,
G_TYPE_NONE, 0);
tree_view_signals[MOVE_CURSOR] =
@ -1035,7 +1035,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkTreeViewClass, select_all),
NULL, NULL,
_gtk_marshal_BOOLEAN__NONE,
_gtk_marshal_BOOLEAN__VOID,
G_TYPE_BOOLEAN, 0);
tree_view_signals[UNSELECT_ALL] =
@ -1044,7 +1044,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkTreeViewClass, unselect_all),
NULL, NULL,
_gtk_marshal_BOOLEAN__NONE,
_gtk_marshal_BOOLEAN__VOID,
G_TYPE_BOOLEAN, 0);
tree_view_signals[SELECT_CURSOR_ROW] =
@ -1063,7 +1063,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkTreeViewClass, toggle_cursor_row),
NULL, NULL,
_gtk_marshal_BOOLEAN__NONE,
_gtk_marshal_BOOLEAN__VOID,
G_TYPE_BOOLEAN, 0);
tree_view_signals[EXPAND_COLLAPSE_CURSOR_ROW] =
@ -1084,7 +1084,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkTreeViewClass, select_cursor_parent),
NULL, NULL,
_gtk_marshal_BOOLEAN__NONE,
_gtk_marshal_BOOLEAN__VOID,
G_TYPE_BOOLEAN, 0);
tree_view_signals[START_INTERACTIVE_SEARCH] =
@ -1093,7 +1093,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkTreeViewClass, start_interactive_search),
NULL, NULL,
_gtk_marshal_BOOLEAN__NONE,
_gtk_marshal_BOOLEAN__VOID,
G_TYPE_BOOLEAN, 0);
/* Key bindings */

View File

@ -2137,7 +2137,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
0,
0,
NULL, NULL,
_gtk_marshal_NONE__NONE,
_gtk_marshal_VOID__VOID,
G_TYPE_NONE, 0);
/**