gtk2 0.90.7 → 0.90.8

data/ChangeLog

@@ -1,3 +1,65 @@
+2011-02-28  Vincent Carmona
+
+	* sample/gtk-demo/main.rb: Add gtk-demo directory to $: to fix
+	bugs with ruby1.9.
+	* sample/gtk-demo/textview.rb: add coding header.
+
+2011-02-25  Kouhei Sutou  <kou@cozmixng.org>
+
+	* ext/gtk2/rbgtk.c (remove_from_windows): add nil check for GC
+	finalizer at exit. [#3046538]
+	Reported by Vincent Carmona. Thanks!!!
+
+	* lib/gtk2/base.rb: require 'gdk_pixbuf2' before require 'gtk2'.
+	Patch by id:kenhys. Thanks!!!
+
+2011-02-19  Kouhei Sutou  <kou@cozmixng.org>
+
+	* ext/gtk2/extconf.rb (InitCreator#run): support 'void' as
+	argument declaration.
+
+2011-02-19  Masaaki Aoyagi
+
+	* ext/gtk2/rbgtkspinner.c: add.
+
+	* ext/gtk2/rbgtkcellrendererspinner.c: add.
+
+	* ext/gtk2/rbgtknotebook.c: add methods.
+	Gtk::Notebook#set_action_widget
+	Gtk::Notebook#get_action_widget
+
+2011-02-06  Kouhei Sutou  <kou@cozmixng.org>
+
+	* ext/gtk2/rbgtktreeview.c (row_separator_func): fix type.
+
+2011-02-05  Masaaki Aoyagi
+
+	* ext/gtk2/*.c: change to ANSI C style.
+
+2011-02-04  Masaaki Aoyagi
+
+	* ext/gtk2/rbgdkdisplay.c: fix declaration.
+
+	* ext/gtk2/rbgdkimage.c: fix declaration.
+
+	* ext/gtk2/rbgtkalignment.c: fix declaration.
+
+	* ext/gtk2/rbgtkclipboard.c: fix declaration.
+
+	* ext/gtk2/rbgtkfixed.c: fix declaration.
+
+	* ext/gtk2/rbgtkimcontext.c: fix declaration.
+
+	* ext/gtk2/rbgtkmain.c: fix declaration.
+
+	* ext/gtk2/rbgtktextattributes.c: fix declaration.
+
+	* ext/gtk2/rbgtktreemodel.c: fix declaration.
+
+	* ext/gtk2/rbgtktreeview.c: fix declaration.
+
+	* ext/gtk2/rbgtkwidget.c: fix declaration.
+
 2011-01-31  Kouhei Sutou  <kou@cozmixng.org>
 
 	* Rakefile: create default gtkrc to use "MS-Windows" GTK+ theme.

data/ext/gtk2/extconf.rb

@@ -112,7 +112,7 @@ class InitCreator
     except_targets = ["Init_gtk2()", "Init_gtk_gdk()", "Init_gtk_gtk()"]
     @targets.each do |target|
       target.each_line do |line|
-        if /^(Init_.*\(\))(.*)/ =~ line
+        if /^(Init_.*\((?:void)?\))(.*)/ =~ line
           init = $1
           unless except_targets.include?(init)
             flag = $2
@@ -134,7 +134,7 @@ class InitCreator
     print_data(inits, "GTK_DISABLE_DEPRECATED", "ifndef", true)
     print_data(inits, "GTK_ENABLE_BROKEN", "ifdef", true)
 
-    print "void Init_gtk_inits()\n"
+    print "void Init_gtk_inits(void)\n"
     print "{\n"
     print_data(inits, "", nil)
     print_data(inits, "GTK_DISABLE_DEPRECATED", "ifndef")

data/ext/gtk2/rbgdk.c

@@ -27,23 +27,20 @@ void        gdk_parse_args                  (gint *argc,
 
 #if GTK_CHECK_VERSION(2,2,0)
 static VALUE
-gdk_s_get_display_arg_name(self)
-    VALUE self;
+gdk_s_get_display_arg_name(VALUE self)
 {
     return CSTR2RVAL(gdk_get_display_arg_name());
 }
 #endif
 
 static VALUE
-gdk_s_set_locale(self)
-    VALUE self;
+gdk_s_set_locale(VALUE self)
 {
     return CSTR2RVAL(gdk_set_locale());
 }
 
 static VALUE
-gdk_s_set_sm_client_id(self, id)
-    VALUE self, id;
+gdk_s_set_sm_client_id(VALUE self, VALUE id)
 {
     gdk_set_sm_client_id(NIL_P(id) ? NULL : RVAL2CSTR(id));
     return self;
@@ -73,23 +70,20 @@ gdk_s_notify_startup_complete(int argc, VALUE *argv, VALUE self)
 #endif
 
 static VALUE
-gdk_s_get_program_class(self)
-    VALUE self;
+gdk_s_get_program_class(VALUE self)
 {
     return CSTR2RVAL(gdk_get_program_class());
 }
 
 static VALUE
-gdk_s_set_program_class(self, program_class)
-    VALUE self, program_class;
+gdk_s_set_program_class(VALUE self, VALUE program_class)
 {
     gdk_set_program_class(RVAL2CSTR(program_class));
     return self;
 }
 
 static VALUE
-gdk_s_get_display(self)
-    VALUE self;
+gdk_s_get_display(VALUE self)
 {
     return CSTR2RVAL(gdk_get_display());
 }
@@ -103,9 +97,7 @@ static VALUE rb_x_error;
 static VALUE rb_x_io_error;
 
 static int
-rbgdk_x_error(display, error) 
-    Display* display;
-    XErrorEvent* error;
+rbgdk_x_error(Display *display, XErrorEvent *error)
 {
      gchar buf[64];
                                                                                 
@@ -118,8 +110,7 @@ rbgdk_x_error(display, error)
 }
 
 static int
-rbgdk_x_io_error(display) 
-    Display* display;
+rbgdk_x_io_error(Display *display)
 {
     int errno_saved = errno;
     const gchar* disp;
@@ -143,8 +134,7 @@ rbgdk_x_io_error(display)
 #endif 
 
 static VALUE
-gdk_s_set_x_error_handler(self)
-    VALUE self;
+gdk_s_set_x_error_handler(VALUE self)
 {
 #ifdef HAVE_XGETERRORTEXT
     rb_x_error = rb_block_proc();
@@ -157,8 +147,7 @@ gdk_s_set_x_error_handler(self)
 }
 
 static VALUE
-gdk_s_set_x_io_error_handler(self)
-    VALUE self;
+gdk_s_set_x_io_error_handler(VALUE self)
 {
 #ifdef HAVE_XGETERRORTEXT
     rb_x_io_error = rb_block_proc();
@@ -171,44 +160,38 @@ gdk_s_set_x_io_error_handler(self)
 }
 
 static VALUE
-gdk_s_flush(self)
-    VALUE self;
+gdk_s_flush(VALUE self)
 {
     gdk_flush();
     return self;
 }
 
 static VALUE
-gdk_s_screen_width(self)
-    VALUE self;
+gdk_s_screen_width(VALUE self)
 {
     return INT2NUM(gdk_screen_width());
 }
 
 static VALUE
-gdk_s_screen_width_mm(self)
-    VALUE self;
+gdk_s_screen_width_mm(VALUE self)
 {
     return INT2NUM(gdk_screen_width_mm());
 }
 
 static VALUE
-gdk_s_screen_height(self)
-   VALUE self;
+gdk_s_screen_height(VALUE self)
 {
     return INT2NUM(gdk_screen_height());
 }
 
 static VALUE
-gdk_s_screen_height_mm(self)
-    VALUE self;
+gdk_s_screen_height_mm(VALUE self)
 {
     return INT2NUM(gdk_screen_height_mm());
 }
 
 static VALUE
-gdk_s_pointer_grab(self, win, owner_events, event_mask, confine_to, cursor, time)
-    VALUE self, win, owner_events, event_mask, confine_to, cursor, time;
+gdk_s_pointer_grab(VALUE self, VALUE win, VALUE owner_events, VALUE event_mask, VALUE confine_to, VALUE cursor, VALUE time)
 {
     return GENUM2RVAL(gdk_pointer_grab(GDK_WINDOW(RVAL2GOBJ(win)),
                      RVAL2CBOOL(owner_events),
@@ -219,16 +202,14 @@ gdk_s_pointer_grab(self, win, owner_events, event_mask, confine_to, cursor, time
 }
 
 static VALUE
-gdk_s_pointer_ungrab(self, time)
-    VALUE self, time;
+gdk_s_pointer_ungrab(VALUE self, VALUE time)
 {
     gdk_pointer_ungrab(NUM2INT(time));
     return self;
 }
 
 static VALUE
-gdk_s_keyboard_grab(self, win, owner_events, time)
-    VALUE self, win, owner_events, time;
+gdk_s_keyboard_grab(VALUE self, VALUE win, VALUE owner_events, VALUE time)
 {
     return GENUM2RVAL(gdk_keyboard_grab(GDK_WINDOW(RVAL2GOBJ(win)), 
                                         RVAL2CBOOL(owner_events), NUM2INT(time)), 
@@ -236,55 +217,48 @@ gdk_s_keyboard_grab(self, win, owner_events, time)
 }
 
 static VALUE
-gdk_s_keyboard_ungrab(self, time)
-    VALUE self, time;
+gdk_s_keyboard_ungrab(VALUE self, VALUE time)
 {
     gdk_keyboard_ungrab(NUM2INT(time));
     return self;
 }
 
 static VALUE
-gdk_s_pointer_is_grabbed(self)
-    VALUE self;
+gdk_s_pointer_is_grabbed(VALUE self)
 {
     return CBOOL2RVAL(gdk_pointer_is_grabbed());
 }
 
 static VALUE
-gdk_s_set_double_click_time(self, msec)
-    VALUE self, msec;
+gdk_s_set_double_click_time(VALUE self, VALUE msec)
 {
     gdk_set_double_click_time(NUM2UINT(msec));
     return self;
 }
 
 static VALUE
-gdk_s_beep(self)
-    VALUE self;
+gdk_s_beep(VALUE self)
 {
     gdk_beep();
     return self;
 }
 
 static VALUE
-gdk_s_error_trap_push(self)
-    VALUE self;
+gdk_s_error_trap_push(VALUE self)
 {
     gdk_error_trap_push();
     return self;
 }
 
 static VALUE
-gdk_s_error_trap_pop(self)
-    VALUE self;
+gdk_s_error_trap_pop(VALUE self)
 {
     gdk_error_trap_pop();
     return self;
 }
 
 static VALUE
-gdk_s_windowing_x11(self)
-    VALUE self;
+gdk_s_windowing_x11(VALUE self)
 {
 #ifdef GDK_WINDOWING_X11
     return Qtrue;
@@ -294,8 +268,7 @@ gdk_s_windowing_x11(self)
 }
 
 static VALUE
-gdk_s_windowing_win32(self)
-    VALUE self;
+gdk_s_windowing_win32(VALUE self)
 {
 #ifdef GDK_WINDOWING_WIN32
     return Qtrue;
@@ -305,8 +278,7 @@ gdk_s_windowing_win32(self)
 }
 
 static VALUE
-gdk_s_windowing_fb(self)
-    VALUE self;
+gdk_s_windowing_fb(VALUE self)
 {
 #ifdef GDK_WINDOWING_FB
     return Qtrue;
@@ -316,8 +288,7 @@ gdk_s_windowing_fb(self)
 }
 
 static VALUE
-gdk_s_windowing_quartz(self)
-    VALUE self;
+gdk_s_windowing_quartz(VALUE self)
 {
 #ifdef GDK_WINDOWING_QUARTZ
     return Qtrue;
@@ -327,8 +298,7 @@ gdk_s_windowing_quartz(self)
 }
 
 static VALUE
-gdk_s_windowing_directfb(self)
-    VALUE self;
+gdk_s_windowing_directfb(VALUE self)
 {
 #ifdef GDK_WINDOWING_DIRECTFB
     return Qtrue;
@@ -338,8 +308,7 @@ gdk_s_windowing_directfb(self)
 }
 
 static VALUE
-gdk_m_target(self)
-    VALUE self;
+gdk_m_target(VALUE self)
 {
     return CSTR2RVAL(RUBY_GTK2_TARGET);
 }

data/ext/gtk2/rbgdkatom.c

@@ -37,8 +37,7 @@ gdk_atom_get_type (void)
 
 
 GdkAtom
-get_gdkatom(atom)
-    VALUE atom;
+get_gdkatom(VALUE atom)
 {
     if (TYPE(atom) == T_STRING)
         return gdk_atom_intern(RVAL2CSTR(atom), FALSE);
@@ -47,10 +46,7 @@ get_gdkatom(atom)
 /*****************************************/
 
 static VALUE
-gdkatom_s_intern(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+gdkatom_s_intern(int argc, VALUE *argv, VALUE self)
 {
     VALUE name;
     VALUE exist;
@@ -66,8 +62,7 @@ GdkAtom gdk_atom_intern_static_string(const gchar *atom_name);
  */
 
 static VALUE
-gdkatom_initialize(self, num)
-    VALUE self, num;
+gdkatom_initialize(VALUE self, VALUE num)
 {
     guint atom = FIX2INT(num);
     if (atom == 0){
@@ -82,22 +77,19 @@ gdkatom_initialize(self, num)
 }
 
 static VALUE
-gdkatom_name(self)
-    VALUE self;
+gdkatom_name(VALUE self)
 {
     return CSTR2RVAL_FREE(gdk_atom_name(_SELF(self)));
 }
 
 static VALUE
-gdkatom_to_i(self)
-    VALUE self;
+gdkatom_to_i(VALUE self)
 {
     return UINT2NUM(GPOINTER_TO_UINT(_SELF(self)));
 }
 
 static VALUE
-gdkatom_eq(self, other)
-    VALUE self, other;
+gdkatom_eq(VALUE self, VALUE other)
 {
     return CBOOL2RVAL(_SELF(self) == _SELF(other));
 }

data/ext/gtk2/rbgdkcairo.c

@@ -24,8 +24,7 @@
 #define _SELF(self) RVAL2CRCONTEXT(self)
 
 static VALUE
-gdkdraw_cairo_set_source_color(self, color)
-    VALUE self, color;
+gdkdraw_cairo_set_source_color(VALUE self, VALUE color)
 {
     gdk_cairo_set_source_color(_SELF(self), RVAL2GDKCOLOR(color));
     rb_cairo_check_status(cairo_status(_SELF(self)));
@@ -49,8 +48,7 @@ gdkdraw_cairo_set_source_pixbuf(int argc, VALUE *argv, VALUE self)
 
 #if GTK_CHECK_VERSION(2,10,0)
 static VALUE
-gdkdraw_cairo_set_source_pixmap(self, pixmap, pixmap_x, pixmap_y)
-    VALUE self, pixmap, pixmap_x, pixmap_y;
+gdkdraw_cairo_set_source_pixmap(VALUE self, VALUE pixmap, VALUE pixmap_x, VALUE pixmap_y)
 {
     gdk_cairo_set_source_pixmap(_SELF(self), GDK_PIXMAP(RVAL2GOBJ(pixmap)),
                                 NUM2DBL(pixmap_x), NUM2DBL(pixmap_y));
@@ -60,8 +58,7 @@ gdkdraw_cairo_set_source_pixmap(self, pixmap, pixmap_x, pixmap_y)
 #endif
 
 static VALUE
-gdkdraw_cairo_rectangle(self, rectangle)
-    VALUE self, rectangle;
+gdkdraw_cairo_rectangle(VALUE self, VALUE rectangle)
 {
     gdk_cairo_rectangle(_SELF(self), 
                         (GdkRectangle*)RVAL2BOXED(rectangle, GDK_TYPE_RECTANGLE));
@@ -70,8 +67,7 @@ gdkdraw_cairo_rectangle(self, rectangle)
 }
 
 static VALUE
-gdkdraw_cairo_region(self, region)
-    VALUE self, region;
+gdkdraw_cairo_region(VALUE self, VALUE region)
 {
     gdk_cairo_region(_SELF(self), (GdkRegion*)RVAL2BOXED(region, GDK_TYPE_REGION));
     rb_cairo_check_status(cairo_status(_SELF(self)));