gtk2 0.90.7 → 0.90.8

data/ext/gtk2/rbgtkmenubar.c

@@ -15,8 +15,7 @@
 #include "global.h"
 
 static VALUE
-mbar_initialize(self)
-    VALUE self;
+mbar_initialize(VALUE self)
 {
     RBGTK_INITIALIZE(self, gtk_menu_bar_new());
     return Qnil;

data/ext/gtk2/rbgtkmenuitem.c

@@ -17,10 +17,7 @@
 #define _SELF(s) (GTK_MENU_ITEM(RVAL2GOBJ(s)))
 
 static VALUE
-mitem_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+mitem_initialize(int argc, VALUE *argv, VALUE self)
 {
     const gchar *label = NULL;
     VALUE rb_label, use_underline;
@@ -45,16 +42,14 @@ mitem_initialize(argc, argv, self)
 }
 
 static VALUE
-mitem_set_right_justified(self, right_justified)
-    VALUE self, right_justified;
+mitem_set_right_justified(VALUE self, VALUE right_justified)
 {
     gtk_menu_item_set_right_justified(_SELF(self), RVAL2CBOOL(right_justified));
     return self;
 }
 
 static VALUE
-mitem_set_submenu(self, child)
-    VALUE self, child;
+mitem_set_submenu(VALUE self, VALUE child)
 {
     GtkMenuItem *item;
     GtkWidget *submenu;
@@ -70,16 +65,14 @@ mitem_set_submenu(self, child)
 }
 
 static VALUE
-mitem_set_accel_path(self, accel_path)
-    VALUE self, accel_path;
+mitem_set_accel_path(VALUE self, VALUE accel_path)
 {
     gtk_menu_item_set_accel_path(_SELF(self), RVAL2CSTR(accel_path));
     return self;
 }
 
 static VALUE
-mitem_remove_submenu(self)
-    VALUE self;
+mitem_remove_submenu(VALUE self)
 {
     GtkMenuItem *item;
     GtkWidget *submenu;
@@ -94,32 +87,28 @@ mitem_remove_submenu(self)
 }
 
 static VALUE
-mitem_select(self)
-    VALUE self;
+mitem_select(VALUE self)
 {
     gtk_menu_item_select(_SELF(self));
     return self;
 }
 
 static VALUE
-mitem_deselect(self)
-    VALUE self;
+mitem_deselect(VALUE self)
 {
     gtk_menu_item_deselect(_SELF(self));
     return self;
 }
 
 static VALUE
-mitem_activate(self)
-    VALUE self;
+mitem_activate(VALUE self)
 {
     gtk_menu_item_activate(_SELF(self));
     return self;
 }
 
 static VALUE
-mitem_toggle_size_request(self)
-    VALUE self;
+mitem_toggle_size_request(VALUE self)
 {
     gint requisition;
     gtk_menu_item_toggle_size_request(_SELF(self), &requisition);
@@ -127,23 +116,20 @@ mitem_toggle_size_request(self)
 }
 
 static VALUE
-mitem_toggle_size_allocate(self, allocation)
-    VALUE self, allocation;
+mitem_toggle_size_allocate(VALUE self, VALUE allocation)
 {
     gtk_menu_item_toggle_size_allocate(_SELF(self), NUM2INT(allocation));
     return self;
 }
 
 static VALUE
-mitem_get_right_justified(self)
-    VALUE self;
+mitem_get_right_justified(VALUE self)
 {
     return CBOOL2RVAL(gtk_menu_item_get_right_justified(_SELF(self)));
 }
 
 static VALUE
-mitem_get_submenu(self)
-    VALUE self;
+mitem_get_submenu(VALUE self)
 {
     GtkWidget* submenu = gtk_menu_item_get_submenu(_SELF(self));
     return submenu ? GOBJ2RVAL(submenu) : Qnil;

data/ext/gtk2/rbgtkmenushell.c

@@ -18,8 +18,7 @@
 #define RVAL2WIDGET(w) (GTK_WIDGET(RVAL2GOBJ(w)))
 
 static VALUE
-mshell_append(self, child)
-    VALUE self, child;
+mshell_append(VALUE self, VALUE child)
 {
     gtk_menu_shell_append(_SELF(self),RVAL2WIDGET(child));
     G_CHILD_ADD(self, child);
@@ -27,8 +26,7 @@ mshell_append(self, child)
 }
 
 static VALUE
-mshell_prepend(self, child)
-    VALUE self, child;
+mshell_prepend(VALUE self, VALUE child)
 {
     gtk_menu_shell_prepend(_SELF(self), RVAL2WIDGET(child));
     G_CHILD_ADD(self, child);
@@ -36,8 +34,7 @@ mshell_prepend(self, child)
 }
 
 static VALUE
-mshell_insert(self, child, pos)
-    VALUE self, child, pos;
+mshell_insert(VALUE self, VALUE child, VALUE pos)
 {
     gtk_menu_shell_insert(_SELF(self), RVAL2WIDGET(child),
                           NUM2INT(pos));
@@ -46,16 +43,14 @@ mshell_insert(self, child, pos)
 }
 
 static VALUE
-mshell_deactivate(self)
-    VALUE self;
+mshell_deactivate(VALUE self)
 {
     gtk_menu_shell_deactivate(_SELF(self));
     return self;
 }
 
 static VALUE
-mshell_select_item(self, menu_item)
-    VALUE self, menu_item;
+mshell_select_item(VALUE self, VALUE menu_item)
 {
     gtk_menu_shell_select_item(_SELF(self), RVAL2WIDGET(menu_item));
     return self;
@@ -63,8 +58,7 @@ mshell_select_item(self, menu_item)
 
 #if GTK_CHECK_VERSION(2,2,0)
 static VALUE
-mshell_select_first(self, search_sensitive)
-    VALUE self, search_sensitive;
+mshell_select_first(VALUE self, VALUE search_sensitive)
 {
     gtk_menu_shell_select_first(_SELF(self), RVAL2CBOOL(search_sensitive));
     return self;
@@ -72,16 +66,14 @@ mshell_select_first(self, search_sensitive)
 #endif
 
 static VALUE
-mshell_deselect(self)
-    VALUE self;
+mshell_deselect(VALUE self)
 {
     gtk_menu_shell_deselect(_SELF(self));
     return self;
 }
 
 static VALUE
-mshell_activate_item(self, menu_item, force_deactivate)
-    VALUE self, menu_item, force_deactivate;
+mshell_activate_item(VALUE self, VALUE menu_item, VALUE force_deactivate)
 {
     gtk_menu_shell_activate_item(_SELF(self), RVAL2WIDGET(menu_item), 
                                  RVAL2CBOOL(force_deactivate));
@@ -90,8 +82,7 @@ mshell_activate_item(self, menu_item, force_deactivate)
 
 #if GTK_CHECK_VERSION(2,4,0)
 static VALUE
-mshell_cancel(self)
-    VALUE self;
+mshell_cancel(VALUE self)
 {
     gtk_menu_shell_cancel(_SELF(self));
     return self;

data/ext/gtk2/rbgtkmenutoolbutton.c

@@ -16,10 +16,7 @@
 #define _SELF(self) (GTK_MENU_TOOL_BUTTON(RVAL2GOBJ(self)))
 
 static VALUE
-menutoolbutton_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+menutoolbutton_initialize(int argc, VALUE *argv, VALUE self)
 {
     GtkToolItem* item;
 
@@ -47,10 +44,7 @@ menutoolbutton_initialize(argc, argv, self)
 }
 
 static VALUE
-menutoolbutton_set_arrow_tooltip(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+menutoolbutton_set_arrow_tooltip(int argc, VALUE *argv, VALUE self)
 {
     VALUE tooltips, tip_text, tip_private;
 

data/ext/gtk2/rbgtkmessagedialog.c

@@ -14,10 +14,7 @@
 #define _SELF(s) (GTK_MESSAGE_DIALOG(RVAL2GOBJ(s)))
 
 static VALUE
-mdiag_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+mdiag_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE parent, flags, type, buttons, message;
     GtkWidget* w;
@@ -46,8 +43,7 @@ GtkWidget*  gtk_message_dialog_new_with_markup
 */
 #if GTK_CHECK_VERSION(2,4,0)
 static VALUE
-mdiag_set_markup(self, str)
-    VALUE self, str;
+mdiag_set_markup(VALUE self, VALUE str)
 {
     gtk_message_dialog_set_markup(_SELF(self), RVAL2CSTR(str));
     return self;
@@ -61,16 +57,14 @@ void        gtk_message_dialog_set_image    (GtkMessageDialog *dialog,
 
 #if GTK_CHECK_VERSION(2,6,0)
 static VALUE
-mdiag_format_secondary_text(self, text)
-    VALUE self, text;
+mdiag_format_secondary_text(VALUE self, VALUE text)
 {
     gtk_message_dialog_format_secondary_text(_SELF(self), RVAL2CSTR(text), NULL);
     return self;
 }
 
 static VALUE
-mdiag_format_secondary_markup(self, markup)
-    VALUE self, markup;
+mdiag_format_secondary_markup(VALUE self, VALUE markup)
 {
     gtk_message_dialog_format_secondary_markup(_SELF(self), RVAL2CSTR(markup), NULL);
     return self;

data/ext/gtk2/rbgtkmisc.c

@@ -17,24 +17,21 @@
 #define _SELF(s) (GTK_MISC(RVAL2GOBJ(s)))
 
 static VALUE
-misc_set_align(self, xalign, yalign)
-    VALUE self, xalign, yalign;
+misc_set_align(VALUE self, VALUE xalign, VALUE yalign)
 {
     gtk_misc_set_alignment(_SELF(self), NUM2DBL(xalign), NUM2DBL(yalign));
     return self;
 }
 
 static VALUE
-misc_set_padding(self, xpad, ypad)
-    VALUE self, xpad, ypad;
+misc_set_padding(VALUE self, VALUE xpad, VALUE ypad)
 {
     gtk_misc_set_padding(_SELF(self), NUM2DBL(xpad), NUM2DBL(ypad));
     return self;
 }
 
 static VALUE
-misc_get_align(self)
-    VALUE self;
+misc_get_align(VALUE self)
 {
     gfloat xalign, yalign;
     gtk_misc_get_alignment(_SELF(self), &xalign, &yalign);
@@ -43,8 +40,7 @@ misc_get_align(self)
 }
 
 static VALUE
-misc_get_padding(self)
-    VALUE self;
+misc_get_padding(VALUE self)
 {
     gint xpad, ypad;
     gtk_misc_get_padding(_SELF(self), &xpad, &ypad);

data/ext/gtk2/rbgtknotebook.c

@@ -19,18 +19,14 @@
 #define GTK_TYPE_NOTEBOOK_PAGE (gtk_notebookpage_get_type())
 
 static VALUE
-note_initialize(self)
-    VALUE self;
+note_initialize(VALUE self)
 {
     RBGTK_INITIALIZE(self, gtk_notebook_new());
     return Qnil;
 }
 
 static VALUE
-note_append_page(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+note_append_page(int argc, VALUE *argv, VALUE self)
 {
     VALUE child, label;
 
@@ -44,10 +40,7 @@ note_append_page(argc, argv, self)
 }
 
 static VALUE
-note_append_page_menu(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+note_append_page_menu(int argc, VALUE *argv, VALUE self)
 {
     VALUE child, tab_label, menu_label;
     
@@ -61,10 +54,7 @@ note_append_page_menu(argc, argv, self)
 }
 
 static VALUE
-note_prepend_page(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+note_prepend_page(int argc, VALUE *argv, VALUE self)
 {
     VALUE child, label;
 
@@ -76,10 +66,7 @@ note_prepend_page(argc, argv, self)
 }
 
 static VALUE
-note_prepend_page_menu(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+note_prepend_page_menu(int argc, VALUE *argv, VALUE self)
 {
     VALUE child, tab_label, menu_label;
 
@@ -93,10 +80,7 @@ note_prepend_page_menu(argc, argv, self)
 }
 
 static VALUE
-note_insert_page(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+note_insert_page(int argc, VALUE *argv, VALUE self)
 {
     VALUE pos, child, label;
 
@@ -109,10 +93,7 @@ note_insert_page(argc, argv, self)
 }
 
 static VALUE
-note_insert_page_menu(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+note_insert_page_menu(int argc, VALUE *argv, VALUE self)
 {
     VALUE pos, child, tab_label, menu_label;
 
@@ -126,40 +107,35 @@ note_insert_page_menu(argc, argv, self)
 }
 
 static VALUE
-note_remove_page(self, pos)
-    VALUE self, pos;
+note_remove_page(VALUE self, VALUE pos)
 {
     gtk_notebook_remove_page(_SELF(self), NUM2INT(pos));
     return self;
 }
 
 static VALUE
-note_page_num(self, child)
-    VALUE self, child;
+note_page_num(VALUE self, VALUE child)
 {
     return INT2FIX(gtk_notebook_page_num(_SELF(self),
                                          RVAL2WIDGET(child)));
 }
 
 static VALUE
-note_next_page(self)
-    VALUE self;
+note_next_page(VALUE self)
 {
     gtk_notebook_next_page(_SELF(self));
     return self;
 }
 
 static VALUE
-note_prev_page(self)
-    VALUE self;
+note_prev_page(VALUE self)
 {
     gtk_notebook_prev_page(_SELF(self));
     return self;
 }
 
 static VALUE
-note_reorder_child(self, child, pos)
-    VALUE self, child, pos;
+note_reorder_child(VALUE self, VALUE child, VALUE pos)
 {
     gtk_notebook_reorder_child(_SELF(self), RVAL2WIDGET(child),
                                NUM2INT(pos));
@@ -167,16 +143,14 @@ note_reorder_child(self, child, pos)
 }
 
 static VALUE
-note_get_menu_label(self, child)
-    VALUE self, child;
+note_get_menu_label(VALUE self, VALUE child)
 {
     return GOBJ2RVAL(gtk_notebook_get_menu_label(_SELF(self),
                                                  RVAL2WIDGET(child)));
 }
 
 static VALUE
-note_get_nth_page(self, page_num)
-    VALUE self, page_num;
+note_get_nth_page(VALUE self, VALUE page_num)
 {
     GtkWidget *page = gtk_notebook_get_nth_page(_SELF(self),
                                                 NUM2INT(page_num));
@@ -185,24 +159,21 @@ note_get_nth_page(self, page_num)
 
 #if GTK_CHECK_VERSION(2,2,0)
 static VALUE
-note_get_n_pages(self)
-    VALUE self;
+note_get_n_pages(VALUE self)
 {
     return INT2NUM(gtk_notebook_get_n_pages(_SELF(self)));
 }
 #endif
 
 static VALUE
-note_get_tab_label(self, child)
-    VALUE self, child;
+note_get_tab_label(VALUE self, VALUE child)
 {
     return GOBJ2RVAL(gtk_notebook_get_tab_label(_SELF(self),
                                                 RVAL2WIDGET(child)));
 }
 
 static VALUE
-note_query_tab_label_packing(self, child)
-    VALUE self, child;
+note_query_tab_label_packing(VALUE self, VALUE child)
 {
     gboolean expand, fill;
     GtkPackType pack_type;
@@ -219,8 +190,7 @@ note_query_tab_label_packing(self, child)
 }
 
 static VALUE
-note_set_menu_label(self, child, label)
-    VALUE self, child, label;
+note_set_menu_label(VALUE self, VALUE child, VALUE label)
 {
     gtk_notebook_set_menu_label(_SELF(self),
                                 RVAL2WIDGET(child),
@@ -229,8 +199,7 @@ note_set_menu_label(self, child, label)
 }
 
 static VALUE
-note_set_menu_label_text(self, child, text)
-    VALUE self, child, text;
+note_set_menu_label_text(VALUE self, VALUE child, VALUE text)
 {
     gtk_notebook_set_menu_label_text(_SELF(self),
                                      RVAL2WIDGET(child),
@@ -239,8 +208,7 @@ note_set_menu_label_text(self, child, text)
 }
 
 static VALUE
-note_set_tab_label(self, child, label)
-    VALUE self, child, label;
+note_set_tab_label(VALUE self, VALUE child, VALUE label)
 {
     gtk_notebook_set_tab_label(_SELF(self),
                                RVAL2WIDGET(child),
@@ -249,8 +217,7 @@ note_set_tab_label(self, child, label)
 }
 
 static VALUE
-note_set_tab_label_packing(self, child, expand, fill, pack_type)
-    VALUE self, child, expand, fill, pack_type;
+note_set_tab_label_packing(VALUE self, VALUE child, VALUE expand, VALUE fill, VALUE pack_type)
 {
     gtk_notebook_set_tab_label_packing(_SELF(self),
                                        RVAL2WIDGET(child),
@@ -260,8 +227,7 @@ note_set_tab_label_packing(self, child, expand, fill, pack_type)
 }
 
 static VALUE
-note_set_tab_label_text(self, child, text)
-    VALUE self, child, text;
+note_set_tab_label_text(VALUE self, VALUE child, VALUE text)
 {
     gtk_notebook_set_tab_label_text(_SELF(self),
                                     RVAL2WIDGET(child),
@@ -270,16 +236,14 @@ note_set_tab_label_text(self, child, text)
 }
 
 static VALUE
-note_get_menu_label_text(self, child)
-    VALUE self, child;
+note_get_menu_label_text(VALUE self, VALUE child)
 {
     return CSTR2RVAL(gtk_notebook_get_menu_label_text(_SELF(self), 
                                                       RVAL2WIDGET(child)));
 }
 
 static VALUE
-note_get_tab_label_text(self, child)
-    VALUE self, child;
+note_get_tab_label_text(VALUE self, VALUE child)
 {
     return CSTR2RVAL(gtk_notebook_get_tab_label_text(_SELF(self), 
                                                      RVAL2WIDGET(child)));
@@ -287,15 +251,13 @@ note_get_tab_label_text(self, child)
 
 #if GTK_CHECK_VERSION(2,10,0)
 static VALUE
-note_get_tab_reorderable(self, child)
-    VALUE self, child;
+note_get_tab_reorderable(VALUE self, VALUE child)
 {
     return CBOOL2RVAL(gtk_notebook_get_tab_reorderable(_SELF(self), 
                                                        GTK_WIDGET(RVAL2GOBJ(child))));
 }
 static VALUE
-note_set_tab_reorderable(self, child, reorderable)
-    VALUE self, child, reorderable;
+note_set_tab_reorderable(VALUE self, VALUE child, VALUE reorderable)
 {
     gtk_notebook_set_tab_reorderable(_SELF(self), GTK_WIDGET(RVAL2GOBJ(child)),
                                      RVAL2CBOOL(reorderable));
@@ -303,15 +265,13 @@ note_set_tab_reorderable(self, child, reorderable)
 }
 
 static VALUE
-note_get_tab_detachable(self, child)
-    VALUE self, child;
+note_get_tab_detachable(VALUE self, VALUE child)
 {
     return CBOOL2RVAL(gtk_notebook_get_tab_detachable(_SELF(self), 
                                                       GTK_WIDGET(RVAL2GOBJ(child))));
 }
 static VALUE
-note_set_tab_detachable(self, child, detachable)
-    VALUE self, child, detachable;
+note_set_tab_detachable(VALUE self, VALUE child, VALUE detachable)
 {
     gtk_notebook_set_tab_detachable(_SELF(self), GTK_WIDGET(RVAL2GOBJ(child)),
                                      RVAL2CBOOL(detachable));
@@ -319,12 +279,7 @@ note_set_tab_detachable(self, child, detachable)
 }
 
 static GtkNotebook*
-creation_func(source, page, x, y, func)
-    GtkNotebook *source;
-    GtkWidget *page;
-    gint x;
-    gint y;
-    gpointer func;
+creation_func(GtkNotebook *source, GtkWidget *page, gint x, gint y, gpointer func)
 {
     VALUE ret;
     ret = rb_funcall((VALUE)func, id_call, 4, GOBJ2RVAL(source), GOBJ2RVAL(page),
@@ -333,8 +288,7 @@ creation_func(source, page, x, y, func)
 }
 
 static VALUE
-note_set_window_creation_hook(self)
-    VALUE self;
+note_set_window_creation_hook(VALUE self)
 {
     VALUE func = rb_block_proc();
     G_RELATIVE(self, func);
@@ -344,6 +298,24 @@ note_set_window_creation_hook(self)
 }    
 #endif
 
+#if GTK_CHECK_VERSION(2,20,0)
+static VALUE
+note_set_action_widget(VALUE self, VALUE widget, VALUE pack_type)
+{
+    gtk_notebook_set_action_widget(_SELF(self),
+                                   RVAL2WIDGET(widget),
+                                   RVAL2GENUM(pack_type, GTK_TYPE_PACK_TYPE));
+    return self;
+}
+
+static VALUE
+note_get_action_widget(VALUE self, VALUE pack_type)
+{
+    return GOBJ2RVAL(gtk_notebook_get_action_widget(_SELF(self),
+                                                    RVAL2GENUM(pack_type, GTK_TYPE_PACK_TYPE)));
+}
+#endif
+
 /***********************************************/
 /*
  * Gtk::NotebookPage
@@ -375,9 +347,7 @@ gtk_notebookpage_get_type(void)
 }
 
 static VALUE
-signal_g2r_func(num, values)
-    guint num;
-    const GValue* values;
+signal_g2r_func(guint num, const GValue *values)
 {
     GtkNotebookPageData npp;
     npp.parent = GVAL2RVAL(&values[0]);
@@ -474,6 +444,10 @@ Init_gtk_notebook()
     rb_define_method(gNotebook, "get_tab_detachable", note_get_tab_detachable, 1);
     rb_define_method(gNotebook, "set_tab_detachable", note_set_tab_detachable, 2);
     rb_define_singleton_method(gNotebook, "set_window_creation_hook", note_set_window_creation_hook, 0);
+#endif
+#if GTK_CHECK_VERSION(2,20,0)
+    rb_define_method(gNotebook, "set_action_widget", note_set_action_widget, 2);
+    rb_define_method(gNotebook, "get_action_widget", note_get_action_widget, 1);
 #endif
     /* GtkNotebookTab */
     rb_define_const(gNotebook, "TAB_FIRST", GTK_NOTEBOOK_TAB_FIRST);