gtk2 1.0.0-x86-mingw32 → 1.0.1-x86-mingw32

data/ChangeLog

@@ -1,3 +1,55 @@
+2011-09-16  Nikolai Weibull  <now@bitwi.se>
+
+	* lib/gtk2.rb: Remove unused variable.
+	* gtk2/ext/gtk2/rbgdkscreen.c: Use RVAL2STRV() instead of RVAL2ARGV().
+
+2011-09-15  Nikolai Weibull  <now@bitwi.se>
+
+	* ext/gtk2/*.c: Use new G_REPLACE_SET_PROPERTY(),
+	G_REPLACE_GET_PROPERTY(), and G_REPLACE_ACTION() macros.
+
+2011-09-14  Nikolai Weibull  <now@bitwi.se>
+
+	* ext/gtk2/*.c: Fix various compiler warnings.
+
+2011-09-12  Nikolai Weibull  <now@bitwi.se>
+
+	* ext/gtk2/*.c: Remove methods that implement methods already
+	implemented as properties.
+	* ext/gtk2/*.c: Call StringValue() before calling
+	RSTRING_PTR()/RSTRING_LEN(); also use RSTRING_PTR() instead of
+	RVAL2CSTR() if StringValue() has already been called on the value.
+
+2011-09-11  Kouhei Sutou  <kou@cozmixng.org>
+
+	* ext/gtk2/extconf.rb (InitCreator#print_data): fix wrong
+	initialization order bug. If "Init_gtk_gdk_gc()" is the first
+	initialize function, the previous implementation can't resolve
+	dependency order.
+	Reported by ashbb. Thanks!!!
+
+2011-09-10  Nikolai Weibull  <now@bitwi.se>
+
+	* ext/gtk2/*.c: Fix all RVAL2CSTRFILENAME calls.
+
+2011-09-09  Nikolai Weibull  <now@bitwi.se>
+
+	* ext/gtk2/*.c: Fix all warnings generated with gcc 4.4.5.
+	* ext/gtk2/*.c: Fix all RVAL2CSTR calls.
+
+2011-08-25  Kouhei Sutou  <kou@cozmixng.org>
+
+	* ext/gtk2/rbgtkfilefilter.c (Gtk::FileFilter#add_custom): fix
+	crash bug because of method name is missing.
+	Reported by Jeff Moore. Thanks!!!
+
+2011-07-31  Kouhei Sutou  <kou@cozmixng.org>
+
+	* ext/gtk2/rbgtkcellrendererspinner.c, ext/gtk2/rbgtkspinner.c:
+	don't expand "$Date$" because it may include non LANG=C
+	characters. #3383158
+	Reported by Antonio Terceiro. Thanks!!!
+
 2011-06-05  Kouhei Sutou  <kou@cozmixng.org>
 
 	* sample/gtk-demo/cairo-operator.rb

data/ext/gtk2/extconf.rb

@@ -31,6 +31,8 @@ rescue LoadError
   require 'mkmf-gnome2'
 end
 
+have_func("rb_errinfo")
+
 ["glib2", "atk", "pango", "gdk_pixbuf2"].each do |package|
   directory = "#{package}#{version_suffix}"
   build_dir = "#{directory}/tmp/#{RUBY_PLATFORM}/#{package}/#{RUBY_VERSION}"
@@ -98,8 +100,6 @@ if target != "win32" and PKGConfig.have_package('gtk+-unix-print-2.0')
   $defs.push("-DHAVE_GTK_UNIX_PRINT")
 end
 
-have_func("rb_errinfo")
-
 create_pkg_config_file("Ruby/GTK2", package_id, ruby_gnome2_version)
 
 class InitCreator
@@ -136,6 +136,16 @@ class InitCreator
       end
     end
 
+    inits[""] = inits[""].sort_by do |value|
+      if value == "Init_gtk_gdk_draw()"
+        inits[""].size * 2
+      elsif value == "Init_gtk_gdk_gc()"
+        -inits[""].size
+      else
+        inits[""].index(value)
+      end
+    end
+
     print_data(inits, "", nil, true)
     print_data(inits, "GTK_DISABLE_DEPRECATED", "ifndef", true)
     print_data(inits, "GTK_ENABLE_BROKEN", "ifdef", true)
@@ -157,14 +167,13 @@ class InitCreator
       print "##{defs} #{type}\n" if defs
       sorted_array = array[type].dup
       dependencies.each do |key, values|
-        key_index = sorted_array.index(key)
-        values.each do |value|
-          value_index = sorted_array.index(value)
-          next if value_index.nil?
-          sorted_array.delete(value)
-          sorted_array[key_index - 1, 0] = value
-          key_index = sorted_array.index(key)
+        next unless sorted_array.include?(key)
+        sorted_array.delete(key)
+        value_indexes = values.collect do |value|
+          sorted_array.index(value)
         end
+        max_value_index = value_indexes.compact.max
+        sorted_array[max_value_index + 1, 0] = key
       end
       sorted_array.each do |val|
         print "#{extern_def}   #{val};\n"

data/ext/gtk2/rbgdk.h

@@ -23,6 +23,9 @@
 #define GEV2RVAL(ev) (make_gdkevent(ev))
 #define RVAL2GEV(ev) (get_gdkevent(ev))
 #define RVAL2ATOM(atom) (get_gdkatom(atom))
+#define RVAL2GDKNATIVEWINDOW(value) ((GdkNativeWindow)NUM2UINT(value))
+/* TODO: Will UINT2NUM work for pointers on 64-bit Windows? */
+#define GDKNATIVEWINDOW2RVAL(value) UINT2NUM((guint32)value)
 
 #define GDK_TYPE_GEOMETRY (gdk_geometry_get_type())
 #define GDK_TYPE_REGION (gdk_region_get_type())

data/ext/gtk2/rbgdkdragcontext.c

@@ -84,24 +84,24 @@ gdkdragcontext_s_get_protocol(int argc, VALUE *argv, VALUE self)
 {
     VALUE xid;
     GdkDragProtocol prot;
-    guint32 ret;
+    GdkNativeWindow ret;
 
     if (argc == 1) {
         rb_scan_args(argc, argv, "10", &xid);
-        ret = gdk_drag_get_protocol(NUM2UINT(xid), &prot);
+        ret = gdk_drag_get_protocol(RVAL2GDKNATIVEWINDOW(xid), &prot);
     } else {
 #if GTK_CHECK_VERSION(2,2,0)
         VALUE display;
         rb_scan_args(argc, argv, "20", &display, &xid);
         ret = gdk_drag_get_protocol_for_display(GDK_DISPLAY_OBJECT(RVAL2GOBJ(display)),
-                                                NUM2UINT(xid), &prot);
+                                                RVAL2GDKNATIVEWINDOW(xid), &prot);
 #else
         rb_warn("Not supported arguments for Gdk::Display in GTK+-2.0.x.");
         ret = gdk_drag_get_protocol(NUM2UINT(xid), &prot);
 #endif
     }
 
-    return rb_ary_new3(2, GENUM2RVAL(prot, GDK_TYPE_DRAG_PROTOCOL), UINT2NUM(ret));
+    return rb_ary_new3(2, GENUM2RVAL(prot, GDK_TYPE_DRAG_PROTOCOL), GDKNATIVEWINDOW2RVAL(ret));
 }
 
 /* Instance Methods */

data/ext/gtk2/rbgdkevent.c

@@ -51,7 +51,7 @@ gdkevent ## type ## _ ## name (VALUE self)\
 static VALUE \
 gdkevent ## type ## _set_ ## name (VALUE self, VALUE val)\
 {\
-    get_gdkevent(self)->type.name = RVAL2CSTR(val);\
+    get_gdkevent(self)->type.name = (gchar *)RVAL2CSTR(val);\
     return self;\
 }
 
@@ -81,6 +81,19 @@ gdkevent ## type ## _set_ ## name (VALUE self, VALUE val)\
     return self;\
 }
 
+#define ATTR_GDKNATIVEWINDOW(type, name)\
+static VALUE \
+gdkevent ## type ## _ ## name (VALUE self)\
+{\
+    return GDKNATIVEWINDOW2RVAL(get_gdkevent(self)->type.name);\
+}\
+static VALUE \
+gdkevent ## type ## _set_ ## name (VALUE self, VALUE val)\
+{\
+    get_gdkevent(self)->type.name = RVAL2GDKNATIVEWINDOW(val);\
+    return self;\
+}
+
 #define ATTR_FLOAT(type, name)\
 static VALUE \
 gdkevent ## type ## _ ## name (VALUE self)\
@@ -502,7 +515,7 @@ GDKEVENT_INIT(property, GDK_PROPERTY_NOTIFY);
 ATTR_ATOM(selection, selection);
 ATTR_ATOM(selection, target);
 ATTR_ATOM(selection, property);
-ATTR_UINT(selection, requestor);
+ATTR_GDKNATIVEWINDOW(selection, requestor);
 ATTR_INT(selection, time);
 
 /* GdkEventDND */
@@ -557,13 +570,13 @@ gdkeventclient_send_client_message(int argc, VALUE *argv, VALUE self)
     rb_scan_args(argc, argv, "11", &xid, &display);
     if (NIL_P(display)){
         return CBOOL2RVAL(gdk_event_send_client_message(
-                              get_gdkevent(self), NUM2INT(xid)));
+                              get_gdkevent(self), RVAL2GDKNATIVEWINDOW(xid)));
     } else {
 #if GTK_CHECK_VERSION(2,2,0)
         return CBOOL2RVAL(gdk_event_send_client_message_for_display(
                               GDK_DISPLAY_OBJECT(RVAL2GOBJ(display)),
                               get_gdkevent(self),
-                              NUM2UINT(xid)));
+                              RVAL2GDKNATIVEWINDOW(xid)));
 #else
         rb_warn("this arguments number has been supported since 2.2");
         return Qfalse;
@@ -610,7 +623,7 @@ GDKEVENT_INIT(setting, GDK_SETTING);
 
 /* GdkEventOwnerChange */
 #if GTK_CHECK_VERSION(2,6,0)
-ATTR_UINT(owner_change, owner);
+ATTR_GDKNATIVEWINDOW(owner_change, owner);
 ATTR_ENUM(owner_change, reason, GDK_TYPE_OWNER_CHANGE);
 ATTR_ATOM(owner_change, selection);
 ATTR_UINT(owner_change, time);

data/ext/gtk2/rbgdkpixmap.c

@@ -50,72 +50,67 @@ gdkpmap_create_from_data(int argc, VALUE *argv, VALUE self)
 static VALUE
 gdkpmap_create_from_xpm(VALUE self, VALUE win, VALUE color, VALUE fname)
 {
-    GdkPixmap *new;
+    GdkPixmap *result;
     GdkBitmap *mask;
 
-    new = gdk_pixmap_create_from_xpm(GDK_WINDOW(RVAL2GOBJ(win)), &mask,
-				     RVAL2GDKCOLOR(color), RVAL2CSTR(fname));
-    if (!new) {
-		rb_raise(rb_eArgError, "Pixmap not created from %s", RVAL2CSTR(fname));
-    }
-    return rb_assoc_new(GOBJ2RVAL(new),GOBJ2RVAL(mask));
+    result = gdk_pixmap_create_from_xpm(GDK_WINDOW(RVAL2GOBJ(win)),
+                                        &mask,
+                                        RVAL2GDKCOLOR(color),
+                                        RVAL2CSTR(fname));
+    if (result == NULL)
+        rb_raise(rb_eArgError, "Pixmap not created from %s", RVAL2CSTR(fname));
+
+    return rb_assoc_new(GOBJ2RVAL(result), GOBJ2RVAL(mask));
 }
 
 static VALUE
 gdkpmap_create_from_xpm_d(VALUE self, VALUE win, VALUE tcolor, VALUE data)
 {
-    GdkPixmap *new;
+    GdkPixmap *result;
     GdkBitmap *mask;
-    int i;
-    gchar **buf;
+    const gchar **buf = RVAL2STRV(data);
 
-    Check_Type(data, T_ARRAY);
-    buf = ALLOCA_N(char*, RARRAY_LEN(data));
-    for (i=0; i < RARRAY_LEN(data); i++) {
-        buf[i] = RVAL2CSTR(RARRAY_PTR(data)[i]);
-    }
-    new = gdk_pixmap_create_from_xpm_d(GDK_WINDOW(RVAL2GOBJ(win)),
-				       &mask, RVAL2GDKCOLOR(tcolor), buf);
+    result = gdk_pixmap_create_from_xpm_d(GDK_WINDOW(RVAL2GOBJ(win)),
+                                          &mask,
+                                          RVAL2GDKCOLOR(tcolor),
+                                          (gchar **)buf);
 
-    return rb_assoc_new(GOBJ2RVAL(new),GOBJ2RVAL(mask));
+    g_free(buf);
+
+    return rb_assoc_new(GOBJ2RVAL(result), GOBJ2RVAL(mask));
 }
 
 static VALUE
 gdkpmap_colormap_create_from_xpm(VALUE self, VALUE win, VALUE colormap, VALUE tcolor, VALUE fname)
 {
-    GdkPixmap *new;
+    GdkPixmap *result;
     GdkBitmap *mask;
 
-    new = gdk_pixmap_colormap_create_from_xpm(NIL_P(win) ? NULL : GDK_WINDOW(RVAL2GOBJ(win)), 
-                                              GDK_COLORMAP(RVAL2GOBJ(colormap)),
-                                              &mask, RVAL2GDKCOLOR(tcolor),
-                                              RVAL2CSTR(fname));
-    if (!new) {
-		rb_raise(rb_eArgError, "Pixmap not created from %s", RVAL2CSTR(fname));
-    }
-    return rb_assoc_new(GOBJ2RVAL(new),GOBJ2RVAL(mask));
+    result = gdk_pixmap_colormap_create_from_xpm(NIL_P(win) ? NULL : GDK_WINDOW(RVAL2GOBJ(win)), 
+                                                 GDK_COLORMAP(RVAL2GOBJ(colormap)),
+                                                 &mask,
+                                                 RVAL2GDKCOLOR(tcolor),
+                                                 RVAL2CSTR(fname));
+    if (result == NULL)
+        rb_raise(rb_eArgError, "Pixmap not created from %s", RVAL2CSTR(fname));
+
+    return rb_assoc_new(GOBJ2RVAL(result), GOBJ2RVAL(mask));
 }
 
 static VALUE
 gdkpmap_colormap_create_from_xpm_d(VALUE self, VALUE win, VALUE colormap, VALUE tcolor, VALUE data)
 {
-    GdkPixmap *new;
+    GdkPixmap *result;
     GdkBitmap *mask;
-    int i;
-    gchar **buf;
-
-    Check_Type(data, T_ARRAY);
-    buf = ALLOCA_N(char*, RARRAY_LEN(data));
-    for (i=0; i<RARRAY_LEN(data); i++) {
-	buf[i] = RVAL2CSTR(RARRAY_PTR(data)[i]);
-    }
+    const gchar **buf = RVAL2STRV(data);
 
-    new = gdk_pixmap_colormap_create_from_xpm_d(NIL_P(win) ? NULL : GDK_WINDOW(RVAL2GOBJ(win)),
-                                                GDK_COLORMAP(RVAL2GOBJ(colormap)),
-                                                &mask, RVAL2GDKCOLOR(tcolor),
-						buf);
+    result = gdk_pixmap_colormap_create_from_xpm_d(NIL_P(win) ? NULL : GDK_WINDOW(RVAL2GOBJ(win)),
+                                                   GDK_COLORMAP(RVAL2GOBJ(colormap)),
+                                                   &mask,
+                                                   RVAL2GDKCOLOR(tcolor),
+                                                   (gchar **)buf);
 
-    return rb_assoc_new(GOBJ2RVAL(new),GOBJ2RVAL(mask));
+    return rb_assoc_new(GOBJ2RVAL(result), GOBJ2RVAL(mask));
 }
 
 #ifdef HAVE_XREADBITMAPFILEDATA
@@ -156,21 +151,21 @@ gdkpmap_foreign_new(int argc, VALUE *argv, VALUE self)
     switch(argc)
         {
         case 1:
-            win = gdk_pixmap_foreign_new(NUM2UINT(arg[0]));
+            win = gdk_pixmap_foreign_new(RVAL2GDKNATIVEWINDOW(arg[0]));
             break;
         case 2:
 #if GTK_CHECK_VERSION(2,2,0)
             win = gdk_pixmap_foreign_new_for_display(GDK_DISPLAY_OBJECT(RVAL2GOBJ(arg[0])), 
-                                                     NUM2UINT(arg[1])); 
+                                                     RVAL2GDKNATIVEWINDOW(arg[1])); 
 #else
-            win = gdk_pixmap_foreign_new(NUM2UINT(arg[1])); 
+            win = gdk_pixmap_foreign_new(RVAL2GDKNATIVEWINDOW(arg[1])); 
             rb_warn("Not supported. Use GTK+-2.2.0 or later.");
 #endif
             break;
         case 5:
 #if GTK_CHECK_VERSION(2,10,0)
             win = gdk_pixmap_foreign_new_for_screen(GDK_SCREEN(RVAL2GOBJ(arg[0])), 
-                                                    NUM2UINT(arg[1]), /* anid */
+                                                    RVAL2GDKNATIVEWINDOW(arg[1]), /* anid */
                                                     NUM2INT(arg[2]),  /* width */
                                                     NUM2INT(arg[3]),  /* height */
                                                     NUM2INT(arg[4])); /* depth */
@@ -194,13 +189,13 @@ gdkpmap_lookup(int argc, VALUE *argv, VALUE self)
     switch(argc)
     {
       case 1:
-    	win = gdk_pixmap_lookup(NUM2UINT(arg[0]));
+    	win = gdk_pixmap_lookup(RVAL2GDKNATIVEWINDOW(arg[0]));
 	break;
       case 2:
 #if GTK_CHECK_VERSION(2,2,0)
-    	win = gdk_pixmap_lookup_for_display(RVAL2GOBJ(arg[0]), NUM2UINT(arg[1])); 
+    	win = gdk_pixmap_lookup_for_display(RVAL2GOBJ(arg[0]), RVAL2GDKNATIVEWINDOW(arg[1])); 
 #else
-    	win = gdk_pixmap_lookup(NUM2UINT(arg[1])); 
+    	win = gdk_pixmap_lookup(RVAL2GDKNATIVEWINDOW(arg[1])); 
         rb_warn("Not supported in GTK+-2.0.x.");
 #endif
     	break;

data/ext/gtk2/rbgdkproperty.c

@@ -246,7 +246,8 @@ gdkprop_get(int argc, VALUE *argv, VALUE self)
     VALUE win, property, type, offset=INT2FIX(0), length=INT2FIX(9999), delete;
     
     /* for inner processing */
-    int		i;
+    gint		i;
+    size_t j;
     VALUE	ret = 0;
     
     if(6 == argc)
@@ -279,12 +280,12 @@ gdkprop_get(int argc, VALUE *argv, VALUE self)
          ret = rb_ary_new();
 
          if(rtype != GDK_SELECTION_TYPE_ATOM){
-           for(i = 0; i < (rlen/sizeof(unsigned long)); i++){
-             rb_ary_push(ret, INT2FIX(((unsigned long*)rdat)[i]));
+           for(j = 0; j < (rlen/sizeof(unsigned long)); j++){
+             rb_ary_push(ret, INT2FIX(((unsigned long*)rdat)[j]));
            }
          } else {
-           for(i = 0; i < (rlen/sizeof(unsigned long)); i++){
-             rb_ary_push(ret, BOXED2RVAL((GdkAtom)((unsigned long*)rdat)[i], GDK_TYPE_ATOM));
+           for(j = 0; j < (rlen/sizeof(unsigned long)); j++){
+             rb_ary_push(ret, BOXED2RVAL((GdkAtom)((unsigned long*)rdat)[j], GDK_TYPE_ATOM));
            }
          }
         break;

data/ext/gtk2/rbgdkscreen.c

@@ -270,54 +270,25 @@ gdkscreen_spawn_on_screen(VALUE self, VALUE working_directory, VALUE argv, VALUE
     gboolean ret;
     gint child_pid;
     VALUE func = Qnil;
-    gint gargc, genc, i;
-    gchar** gargv = (gchar**)NULL;
-    gchar** genvp = (gchar**)NULL;
+    gchar **gargv;
+    gchar **genvp;
 
     if (rb_block_given_p()) {
         func = rb_block_proc();
         G_RELATIVE(self, func);
     }
 
-    if (! NIL_P(argv)){
-        Check_Type(argv, T_ARRAY);
-        gargc = RARRAY_LEN(argv);
-        gargv = ALLOCA_N(gchar*, gargc + 1);
-        for (i = 0; i < gargc; i++) {
-            if (TYPE(RARRAY_PTR(argv)[i]) == T_STRING) {
-                gargv[i] = RVAL2CSTR(RARRAY_PTR(argv)[i]);
-            }
-            else {
-                gargv[i] = "";
-            }
-        }
-        gargv[gargc] = (gchar*)NULL;
-    }
-
-    if (! NIL_P(envp)){
-        Check_Type(envp, T_ARRAY);
-        genc = RARRAY_LEN(envp);
-        genvp = ALLOCA_N(gchar*, genc + 1);
-        for (i = 0; i < genc; i++) {
-            if (TYPE(RARRAY_PTR(envp)[i]) == T_STRING) {
-                genvp[i] = RVAL2CSTR(RARRAY_PTR(envp)[i]);
-            }
-            else {
-                genvp[i] = "";
-            }
-        }
-        genvp[genc] = (gchar*)NULL;
-    }
-
+    gargv = (gchar **)RVAL2STRV(argv);
+    genvp = (gchar **)RVAL2STRV(envp);
     ret = gdk_spawn_on_screen(_SELF(self),
                               NIL_P(working_directory) ? NULL : RVAL2CSTR(working_directory),
                               gargv, genvp, NUM2INT(flags),
                               (GSpawnChildSetupFunc)child_setup, (gpointer)func,
                               &child_pid, &err);
-
-    if (! ret){
+    g_free(gargv);
+    g_free(genvp);
+    if (!ret)
         RAISE_GERROR(err);
-    }
     
     return INT2NUM(child_pid);
 }
@@ -329,9 +300,8 @@ gdkscreen_spawn_on_screen_with_pipes(VALUE self, VALUE working_directory, VALUE
     gboolean ret;
     gint child_pid;
     VALUE func = Qnil;
-    gint gargc, genc, i;
-    gchar** gargv = (gchar**)NULL;
-    gchar** genvp = (gchar**)NULL;
+    gchar **gargv;
+    gchar **genvp;
     gint standard_input, standard_output, standard_error;
 
     if (rb_block_given_p()) {
@@ -339,36 +309,8 @@ gdkscreen_spawn_on_screen_with_pipes(VALUE self, VALUE working_directory, VALUE
         G_RELATIVE(self, func);
     }
 
-    if (! NIL_P(argv)){
-        Check_Type(argv, T_ARRAY);
-        gargc = RARRAY_LEN(argv);
-        gargv = ALLOCA_N(gchar*, gargc + 1);
-        for (i = 0; i < gargc; i++) {
-            if (TYPE(RARRAY_PTR(argv)[i]) == T_STRING) {
-                gargv[i] = RVAL2CSTR(RARRAY_PTR(argv)[i]);
-            }
-            else {
-                gargv[i] = "";
-            }
-        }
-        gargv[gargc] = (gchar*)NULL;
-    }
-
-    if (! NIL_P(envp)){
-        Check_Type(envp, T_ARRAY);
-        genc = RARRAY_LEN(envp);
-        genvp = ALLOCA_N(gchar*, genc + 1);
-        for (i = 0; i < genc; i++) {
-            if (TYPE(RARRAY_PTR(envp)[i]) == T_STRING) {
-                genvp[i] = RVAL2CSTR(RARRAY_PTR(envp)[i]);
-            }
-            else {
-                genvp[i] = "";
-            }
-        }
-        genvp[genc] = (gchar*)NULL;
-    }
-
+    gargv = (gchar **)RVAL2STRV(argv);
+    genvp = (gchar **)RVAL2STRV(envp);
     ret = gdk_spawn_on_screen_with_pipes(_SELF(self),
                                          NIL_P(working_directory) ? NULL : RVAL2CSTR(working_directory),
                                          gargv, genvp, NUM2INT(flags),
@@ -376,8 +318,10 @@ gdkscreen_spawn_on_screen_with_pipes(VALUE self, VALUE working_directory, VALUE
                                          &child_pid, 
                                          &standard_input, &standard_output,
                                          &standard_error, &err);
-
-    if (! ret) RAISE_GERROR(err);
+    g_free(gargv);
+    g_free(genvp);
+    if (!ret)
+        RAISE_GERROR(err);
     
     return rb_ary_new3(4, INT2NUM(child_pid), 
                        rb_funcall(rb_cIO, id_new, 1, INT2NUM(standard_input)),
@@ -438,6 +382,7 @@ Init_gtk_gdk_screen()
     rb_define_singleton_method(gdkScreen, "default", gdkscreen_default, 0);
     rb_define_method(gdkScreen, "default_colormap", gdkscreen_get_default_colormap, 0);
     rb_define_method(gdkScreen, "set_default_colormap", gdkscreen_set_default_colormap, 1);
+    G_DEF_SETTER(gdkScreen, "default_colormap");
     rb_define_method(gdkScreen, "system_colormap", gdkscreen_get_system_colormap, 0);
     rb_define_method(gdkScreen, "system_visual", gdkscreen_get_system_visual, 0);
     rb_define_method(gdkScreen, "rgb_colormap", gdkscreen_get_rgb_colormap, 0);
@@ -466,8 +411,8 @@ Init_gtk_gdk_screen()
     rb_define_method(gdkScreen, "get_setting", gdkscreen_get_setting, -1);
 #if GTK_CHECK_VERSION(2,10,0)
 #ifdef HAVE_RB_CAIRO_H
-    rb_define_method(gdkScreen, "font_options", gdkscreen_get_font_options, 0);
-    rb_define_method(gdkScreen, "set_font_options", gdkscreen_set_font_options, 1);
+    G_REPLACE_GET_PROPERTY(gdkScreen, "font_options", gdkscreen_get_font_options, 0);
+    G_REPLACE_SET_PROPERTY(gdkScreen, "font_options", gdkscreen_set_font_options, 1);
 #endif
     rb_define_method(gdkScreen, "active_window", gdkscreen_get_active_window, 0);
     rb_define_method(gdkScreen, "window_stack", gdkscreen_get_window_stack, 0);
@@ -485,7 +430,6 @@ Init_gtk_gdk_screen()
     rb_define_method(gdkScreen, "window_manager_name", gdkscreen_get_window_manager_name, 0);
     rb_define_method(gdkScreen, "screen_number", gdkscreen_get_screen_number, 0);
 #endif
-    G_DEF_SETTERS(gdkScreen);
 
   #ifdef GDK_WINDOWING_X11
     G_DEF_CLASS3("GdkScreenX11", "ScreenX11", mGdk);