gtk2 1.0.0 → 1.0.1

data/ext/gtk2/rbgdkselection.c

@@ -94,7 +94,7 @@ gdkselection_send_notify(int argc, VALUE *argv, VALUE self)
 
     if (argc == 5) {
         rb_scan_args(argc, argv, "50", &requestor, &selection, &target, &property, &time);
-        gdk_selection_send_notify(NUM2UINT(requestor), RVAL2ATOM(selection),
+        gdk_selection_send_notify(RVAL2GDKNATIVEWINDOW(requestor), RVAL2ATOM(selection),
                                   RVAL2ATOM(target), 
                                   NIL_P(property) ? GDK_NONE : RVAL2ATOM(property), 
                                   NUM2INT(time));
@@ -103,7 +103,7 @@ gdkselection_send_notify(int argc, VALUE *argv, VALUE self)
       VALUE display = Qnil;
       rb_scan_args(argc, argv, "60", &display, &requestor, &selection, &target, &property, &time);
       gdk_selection_send_notify_for_display(GDK_DISPLAY_OBJECT(RVAL2GOBJ(display)),
-                                            NUM2UINT(requestor), RVAL2ATOM(selection),
+                                            RVAL2GDKNATIVEWINDOW(requestor), RVAL2ATOM(selection),
                                             RVAL2ATOM(target), 
                                             NIL_P(property) ? GDK_NONE : RVAL2ATOM(property), 
                                             NUM2INT(time));

data/ext/gtk2/rbgdkwindow.c

@@ -594,16 +594,12 @@ gdkwin_set_back_pixmap(VALUE self, VALUE pixmap, VALUE parent_relative)
     return self;
 }
 
-#if !GTK_CHECK_VERSION(2, 18, 0)
-static VALUE
-gdkwin_set_cursor(VALUE self, VALUE cursor)
-{
-    gdk_window_set_cursor(_SELF(self), 
-                          (GdkCursor*)(NIL_P(cursor) ? NULL : RVAL2BOXED(cursor, GDK_TYPE_CURSOR)));
-
-    return self;
-}
-#endif
+/* Properties:
+ *
+ * void                gdk_window_set_cursor               (GdkWindow *window,
+ *                                                          GdkCursor *cursor);
+ * GdkCursor *         gdk_window_get_cursor               (GdkWindow *window);
+ */
 
 /* Obsolete
    #define     gdk_window_set_colormap
@@ -896,7 +892,6 @@ gdkwin_s_get_default_root_window(VALUE self)
 GdkPointerHooks* gdk_set_pointer_hooks      (const GdkPointerHooks *new_hooks);
 */
 
-
 /* From X Window System Interaction */
 static VALUE
 gdkwin_foreign_new(int argc, VALUE *argv, VALUE self)
@@ -909,11 +904,12 @@ gdkwin_foreign_new(int argc, VALUE *argv, VALUE self)
     switch(argc)
     {
       case 1:
-    	win = gdk_window_foreign_new(NUM2UINT(arg[0]));
+    	win = gdk_window_foreign_new(RVAL2GDKNATIVEWINDOW(arg[0]));
 	break;
       case 2:
 #if GTK_CHECK_VERSION(2,2,0)
-    	win = gdk_window_foreign_new_for_display(RVAL2GOBJ(arg[0]), NUM2UINT(arg[1])); 
+    	win = gdk_window_foreign_new_for_display(RVAL2GOBJ(arg[0]),
+                                                 RVAL2GDKNATIVEWINDOW(arg[1])); 
 #else
     	win = gdk_window_foreign_new(NUM2UINT(arg[1])); 
         rb_warn("Not supported in GTK+-2.0.x.");
@@ -938,11 +934,11 @@ gdkwin_lookup(int argc, VALUE *argv, VALUE self)
     switch(argc)
     {
       case 1:
-    	win = gdk_window_lookup(NUM2UINT(arg[0]));
+    	win = gdk_window_lookup(RVAL2GDKNATIVEWINDOW(arg[0]));
 	break;
       case 2:
 #if GTK_CHECK_VERSION(2,2,0)
-    	win = gdk_window_lookup_for_display(RVAL2GOBJ(arg[0]), NUM2UINT(arg[1])); 
+    	win = gdk_window_lookup_for_display(RVAL2GOBJ(arg[0]), RVAL2GDKNATIVEWINDOW(arg[1])); 
 #else
     	win = gdk_window_lookup(NUM2UINT(arg[1])); 
         rb_warn("Not supported in GTK+-2.0.x.");
@@ -1073,9 +1069,6 @@ Init_gtk_gdk_window()
     rb_define_method(gdkWindow, "set_title", gdkwin_set_title, 1);
     rb_define_method(gdkWindow, "set_background", gdkwin_set_background, 1);
     rb_define_method(gdkWindow, "set_back_pixmap", gdkwin_set_back_pixmap, 2);
-#if !GTK_CHECK_VERSION(2, 18, 0)
-    rb_define_method(gdkWindow, "set_cursor", gdkwin_set_cursor, 1);
-#endif
     rb_define_method(gdkWindow, "user_data", gdkwin_get_user_data, 0);
     rb_define_method(gdkWindow, "geometry", gdkwin_get_geometry, 0);
     rb_define_method(gdkWindow, "set_geometry_hints", gdkwin_set_geometry_hints, 2);

data/ext/gtk2/rbgdkwindowattr.c

@@ -58,7 +58,7 @@ attr_get_ ## name (VALUE self)\
 static VALUE \
 attr_set_ ## name (VALUE self, VALUE val)\
 {\
-    _SELF(self)->name = RVAL2CSTR(val);\
+    _SELF(self)->name = (gchar *)RVAL2CSTR(val);\
     return self;\
 }
 

data/ext/gtk2/rbgtkaccelgroup.c

@@ -67,7 +67,7 @@ gaccelgrp_query(VALUE self, VALUE key, VALUE mods)
 {
     GtkAccelGroupEntry *entries;
     guint n_entries;
-    int cnt;
+    guint cnt;
     VALUE result;
 
     entries = gtk_accel_group_query(_SELF(self), NUM2UINT(key),

data/ext/gtk2/rbgtkaction.c

@@ -51,7 +51,12 @@ action_is_visible(VALUE self)
 /* Defined as property.
 const gchar* gtk_action_get_name            (GtkAction *action);
 gboolean    gtk_action_get_sensitive        (GtkAction *action);
+void                gtk_action_set_sensitive            (GtkAction *action,
+                                                         gboolean
+                                                         sensitive);
 gboolean    gtk_action_get_visible          (GtkAction *action);
+void                gtk_action_set_visible              (GtkAction *action,
+                                                         gboolean visible);
 */
 
 static VALUE
@@ -143,6 +148,7 @@ action_set_accel_path(VALUE self, VALUE accel_path)
     gtk_action_set_accel_path(_SELF(self), RVAL2CSTR(accel_path));
     return self;
 }
+
 static VALUE
 action_set_accel_group(VALUE self, VALUE accel_group)
 {
@@ -151,28 +157,6 @@ action_set_accel_group(VALUE self, VALUE accel_group)
 }
 
 #if GTK_CHECK_VERSION(2,6,0)
-/* This set "sensitive" value and call g_object_notify with "sensitive". 
-   If you want not to call g_object_notify,() 
-   Use GLib::Object#set_property("sensitive", val) instead.
- */
-static VALUE
-action_set_sensitive(VALUE self, VALUE sensitive)
-{
-    gtk_action_set_sensitive(_SELF(self), RVAL2CBOOL(sensitive));
-    return self;
-}
-
-/* This set "visible" value and call g_object_notify with "visible". 
-   If you want not to call g_object_notify(), 
-   Use GLib::Object#set_property("visible", val) instead.
-*/
-static VALUE
-action_set_visible(VALUE self, VALUE visible)
-{
-    gtk_action_set_visible(_SELF(self), RVAL2CBOOL(visible));
-    return self;
-}
-
 static VALUE
 action_get_accel_path(VALUE self)
 {
@@ -238,18 +222,16 @@ Init_gtk_action()
     rb_define_method(gAction, "block_activate_from", action_block_activate_from, 1);
     rb_define_method(gAction, "unblock_activate_from", action_unblock_activate_from, 1);
     rb_define_method(gAction, "set_accel_path", action_set_accel_path, 1);
+    G_DEF_SETTER(gAction, "accel_path");
     rb_define_method(gAction, "set_accel_group", action_set_accel_group, 1);
+    G_DEF_SETTER(gAction, "accel_group");
 
 #if GTK_CHECK_VERSION(2,6,0)
-    rb_define_method(gAction, "set_sensitive", action_set_sensitive, 1);
-    rb_define_method(gAction, "set_visible", action_set_visible, 1);
     rb_define_method(gAction, "accel_path", action_get_accel_path, 0);
 #endif
 
 #if GTK_CHECK_VERSION(2,8,0)
     rb_define_method(gAction, "accel_closure", action_get_accel_closure, 0);
 #endif
-
-    G_DEF_SETTERS(gAction);
 #endif
 }

data/ext/gtk2/rbgtkactiongroup.c

@@ -83,7 +83,7 @@ activate_action(GtkAction *action, VALUE self)
 static VALUE
 actiongroup_add_actions(VALUE self, VALUE entries)
 {
-    int i;
+    guint i;
     VALUE action_procs;
     guint n_entries = (guint)RARRAY_LEN(entries);
     GtkActionEntry* gentries = g_new0(GtkActionEntry, n_entries);
@@ -149,7 +149,7 @@ activate_toggle_action(GtkAction *action, VALUE self)
 static VALUE
 actiongroup_add_toggle_actions(VALUE self, VALUE entries)
 {
-    int i;
+    guint i;
     VALUE toggle_action_procs;
     guint n_entries = (guint)RARRAY_LEN(entries);
     GtkToggleActionEntry* gentries = g_new0(GtkToggleActionEntry, n_entries);
@@ -216,7 +216,7 @@ static VALUE
 actiongroup_add_radio_actions(int argc, VALUE *argv, VALUE self)
 {
     VALUE entries, value, proc;
-    int i;
+    guint i;
     guint n_entries;
     GtkRadioActionEntry* gentries;
 
@@ -273,11 +273,11 @@ actiongroup_add_radio_actions(int argc, VALUE *argv, VALUE self)
     return self;
 }
 
-static gchar*
+static gchar *
 translate_func(const gchar *path, gpointer func)
 {
     VALUE ret = rb_funcall((VALUE)func, id_call, 1, CSTR2RVAL(path));
-    return RVAL2CSTR(ret);
+    return (gchar *)RVAL2CSTR(ret);
 }
 
 static VALUE
@@ -345,9 +345,9 @@ Init_gtk_actiongroup()
     rb_define_method(gActionGroup, "add_radio_actions", actiongroup_add_radio_actions, -1);
     rb_define_method(gActionGroup, "set_translate_func", actiongroup_set_translate_func, 0);
     rb_define_method(gActionGroup, "set_translation_domain", actiongroup_set_translation_domain, 1);
+    G_DEF_SETTER(gActionGroup, "translation_domain");
 #if GTK_CHECK_VERSION(2,6,0)
     rb_define_method(gActionGroup, "translate_string", actiongroup_translate_string, 1);
 #endif
-    G_DEF_SETTERS(gActionGroup);
 #endif
 }

data/ext/gtk2/rbgtkadjustment.c

@@ -52,68 +52,26 @@ adj_value_changed(VALUE self)
     return self;
 }
 
-static VALUE
-adj_set_value(VALUE self, VALUE value)
-{
-    gtk_adjustment_set_value(_SELF(self),
-			     NUM2DBL(value));
-    return self;
-}
-
-static VALUE
-adj_get_value(VALUE self)
-{
-    return rb_float_new(_SELF(self)->value);
-}
-
-static VALUE
-adj_get_lower(VALUE self)
-{
-    return rb_float_new(_SELF(self)->lower);
-}
-
-static VALUE
-adj_get_upper(VALUE self)
-{
-    return rb_float_new(_SELF(self)->upper);
-}
-
-static VALUE
-adj_get_step_increment(VALUE self)
-{
-    return rb_float_new(_SELF(self)->step_increment);
-}
-
-static VALUE
-adj_set_step_increment(VALUE self, VALUE inc)
-{
-    _SELF(self)->step_increment = NUM2DBL(inc);
-    return self;
-}
-
-static VALUE
-adj_get_page_increment(VALUE self)
-{
-    return rb_float_new(_SELF(self)->page_increment);
-}
-
-static VALUE
-adj_set_page_increment(VALUE self, VALUE inc)
-{
-    return _SELF(self)->page_increment = NUM2DBL(inc);
-}
-
-static VALUE
-adj_get_page_size(VALUE self)
-{
-    return rb_float_new(_SELF(self)->page_size);
-}
-
-static VALUE
-adj_set_page_size(VALUE self, VALUE size)
-{
-    return _SELF(self)->page_size = NUM2DBL(size);
-}
+/* Properties:
+gdouble             gtk_adjustment_get_value            (GtkAdjustment *adjustment);
+void                gtk_adjustment_set_value            (GtkAdjustment *adjustment,
+                                                         gdouble value);
+gdouble             gtk_adjustment_get_lower            (GtkAdjustment *adjustment);
+gdouble             gtk_adjustment_get_page_increment   (GtkAdjustment *adjustment);
+gdouble             gtk_adjustment_get_page_size        (GtkAdjustment *adjustment);
+gdouble             gtk_adjustment_get_step_increment   (GtkAdjustment *adjustment);
+gdouble             gtk_adjustment_get_upper            (GtkAdjustment *adjustment);
+void                gtk_adjustment_set_lower            (GtkAdjustment *adjustment,
+                                                         gdouble lower);
+void                gtk_adjustment_set_page_increment   (GtkAdjustment *adjustment,
+                                                         gdouble page_increment);
+void                gtk_adjustment_set_page_size        (GtkAdjustment *adjustment,
+                                                         gdouble page_size);
+void                gtk_adjustment_set_step_increment   (GtkAdjustment *adjustment,
+                                                         gdouble step_increment);
+void                gtk_adjustment_set_upper            (GtkAdjustment *adjustment,
+                                                         gdouble upper);
+*/
 
 void 
 Init_gtk_adjustment()
@@ -121,19 +79,7 @@ Init_gtk_adjustment()
     VALUE gAdjustment = G_DEF_CLASS(GTK_TYPE_ADJUSTMENT, "Adjustment", mGtk);
 
     rb_define_method(gAdjustment, "initialize", adj_initialize, 6);
-    rb_define_method(gAdjustment, "set_value", adj_set_value, 1);
     rb_define_method(gAdjustment, "clamp_page", adj_clamp_page, 2);
     rb_define_method(gAdjustment, "changed", adj_changed, 0);
     rb_define_method(gAdjustment, "value_changed", adj_value_changed, 0);
-    rb_define_method(gAdjustment, "value", adj_get_value, 0);
-    rb_define_method(gAdjustment, "lower", adj_get_lower, 0);
-    rb_define_method(gAdjustment, "upper", adj_get_upper, 0);
-    rb_define_method(gAdjustment, "step_increment", adj_get_step_increment, 0);
-    rb_define_method(gAdjustment, "set_step_increment", adj_set_step_increment, 1);
-    rb_define_method(gAdjustment, "page_increment", adj_get_page_increment, 0);
-    rb_define_method(gAdjustment, "set_page_increment", adj_set_page_increment, 1);
-    rb_define_method(gAdjustment, "page_size", adj_get_page_size, 0);
-    rb_define_method(gAdjustment, "set_page_size", adj_set_page_size, 1);
-
-    G_DEF_SETTERS(gAdjustment);
 }

data/ext/gtk2/rbgtkbindingset.c

@@ -113,7 +113,7 @@ binding_entry_add_signal(int argc, VALUE *argv, VALUE self)
             arg->d.long_data = 1;
         } else if (rb_respond_to (param, rb_intern("to_str"))) {
 	    arg->arg_type = G_TYPE_STRING;
-            arg->d.string_data = RVAL2CSTR(param);
+            arg->d.string_data = (gchar *)RVAL2CSTR(param);
         } else {
             rb_raise(rb_eTypeError, 
                      "can not convert %s into String, Numeric, "

data/ext/gtk2/rbgtkbuilder.c

@@ -54,8 +54,9 @@ builder_add_from_string(VALUE self, VALUE string)
 {
     GError *error = NULL;
 
+    StringValue(string);
     if (gtk_builder_add_from_string(_SELF(self),
-                                    RVAL2CSTR(string),
+                                    RSTRING_PTR(string),
                                     RSTRING_LEN(string),
                                     &error) == 0)
         RAISE_GERROR(error);

data/ext/gtk2/rbgtkbutton.c

@@ -57,13 +57,6 @@ button_released(VALUE self)
     return self;
 }
 
-static VALUE
-button_clicked(VALUE self)
-{
-    gtk_button_clicked(_SELF(self));
-    return self;
-}
-
 static VALUE
 button_enter(VALUE self)
 {
@@ -129,13 +122,12 @@ Init_gtk_button()
     rb_define_method(gButton, "initialize", button_initialize, -1);
     rb_define_method(gButton, "pressed", button_pressed, 0);
     rb_define_method(gButton, "released", button_released, 0);
-    rb_define_method(gButton, "clicked", button_clicked, 0);
     rb_define_method(gButton, "enter", button_enter, 0);
     rb_define_method(gButton, "leave", button_leave, 0);
 
 #if GTK_CHECK_VERSION(2,4,0)
     rb_define_method(gButton, "set_alignment", button_set_alignment, 2);
+    G_DEF_SETTER(gButton, "alignment");
     rb_define_method(gButton, "alignment", button_get_alignment, 0);
 #endif
-    G_DEF_SETTERS(gButton);
 }

data/ext/gtk2/rbgtkcalendar.c

@@ -138,8 +138,8 @@ Init_gtk_calendar()
     rb_define_method(gCalendar, "display_options", cal_get_display_options, -1);
 #if GTK_CHECK_VERSION(2,4,0)
     rb_define_method(gCalendar, "set_display_options", cal_set_display_options, 1);
+    G_DEF_SETTER(gCalendar, "display_options");
 #endif
-    G_DEF_SETTERS(gCalendar);
 
     G_DEF_CLASS(GTK_TYPE_CALENDAR_DISPLAY_OPTIONS, "DisplayOptions", gCalendar);
     G_DEF_CONSTANTS(gCalendar, GTK_TYPE_CALENDAR_DISPLAY_OPTIONS, "GTK_CALENDAR_");

data/ext/gtk2/rbgtkcellrendererspinner.c

@@ -3,9 +3,6 @@
 
   rbgtkcellrendererspinner.c -
 
-  $Author: masaakiaoyagi $
-  $Date: 2011-02-19 09:24:49 +0900 (土, 19  2月 2011) $
-
   Copyright (C) 2011 Ruby-GNOME2 Project Team
 ************************************************/
 

data/ext/gtk2/rbgtkcellrenderertext.c

@@ -35,8 +35,7 @@ Init_gtk_cellrenderertext()
     
     rb_define_method(renderer, "initialize", crtext_initialize, 0);
     rb_define_method(renderer, "set_fixed_height_from_font", crtext_set_fixed_height_from_font, 1);
-
-    G_DEF_SETTERS(renderer);
+    G_DEF_SETTER(renderer, "fixed_height_from_font");
 }
 
 

data/ext/gtk2/rbgtkcellview.c

@@ -51,14 +51,11 @@ cview_initialize(int argc, VALUE *argv, VALUE self)
     return Qnil;
 }
 
-static VALUE
-cview_set_model(VALUE self, VALUE model)
-{
-    G_CHILD_SET(self, id_model, model);
-    gtk_cell_view_set_model(_SELF(self), 
-                            NIL_P(model) ? (GtkTreeModel*)NULL : GTK_TREE_MODEL(RVAL2GOBJ(model)));
-    return self;
-}
+/* Properties:
+void                gtk_cell_view_set_model             (GtkCellView *cell_view,
+                                                         GtkTreeModel *model);
+GtkTreeModel *      gtk_cell_view_get_model             (GtkCellView *cell_view);
+*/
 
 static VALUE
 cview_set_displayed_row(VALUE self, VALUE path)
@@ -111,13 +108,11 @@ Init_gtk_cellview()
     id_text = rb_intern("text");
 
     rb_define_method(cview, "initialize", cview_initialize, -1);
-    rb_define_method(cview, "set_model", cview_set_model, 1);
     rb_define_method(cview, "set_displayed_row", cview_set_displayed_row, 1);
+    G_DEF_SETTER(cview, "displayed_row");
     rb_define_method(cview, "displayed_row", cview_get_displayed_row, 0);
     rb_define_method(cview, "get_size_of_row", cview_get_size_of_row, 1);
     rb_define_method(cview, "cell_renderers", cview_get_cell_renderers, 0);
-
-    G_DEF_SETTERS(cview);
 #endif
 }