gtk2 2.0.2-x86-mingw32 → 2.0.3-x86-mingw32

data/ext/gtk2/rbgtktreeiter.c

@@ -216,7 +216,6 @@ rg_operator_treeiter_eql(VALUE self, VALUE other)
     return Qtrue;
 }
 
-#if GTK_CHECK_VERSION(2,2,0)
 static VALUE
 rg_to_str(VALUE self)
 {
@@ -228,7 +227,6 @@ rg_to_str(VALUE self)
     g_free(s);
     return result;
 }
-#endif
 
 void 
 Init_gtk_treeiter(VALUE mGtk)
@@ -248,8 +246,6 @@ Init_gtk_treeiter(VALUE mGtk)
     RG_DEF_METHOD(set_value, 2);
     RG_DEF_METHOD_OPERATOR("[]=", treeiter_set_value_eql, 2);
     RG_DEF_METHOD_OPERATOR("==", treeiter_eql, 1);
-#if GTK_CHECK_VERSION(2,2,0)
     RG_DEF_METHOD(to_str, 0);
     RG_DEF_ALIAS("to_s", "to_str");
-#endif
 }

data/ext/gtk2/rbgtktreemodelfilter.c

@@ -21,8 +21,6 @@
 
 #include "global.h"
 
-#if GTK_CHECK_VERSION(2,4,0)
-
 #define RG_TARGET_NAMESPACE cTreeModelFilter
 #define _SELF(s) (GTK_TREE_MODEL_FILTER(RVAL2GOBJ(s)))
 
@@ -176,12 +174,10 @@ rg_clear_cache(VALUE self)
     gtk_tree_model_filter_clear_cache(_SELF(self));
     return self;
 }
-#endif
 
 void 
 Init_gtk_treemodelfilter(VALUE mGtk)
 {
-#if GTK_CHECK_VERSION(2,4,0)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_TREE_MODEL_FILTER, "TreeModelFilter", mGtk);
 
     id_child_model = rb_intern("child_model");
@@ -199,5 +195,4 @@ Init_gtk_treemodelfilter(VALUE mGtk)
     RG_DEF_METHOD(refilter, 0);
     RG_DEF_METHOD(clear_cache, 0);
     G_DEF_SETTERS(RG_TARGET_NAMESPACE);
-#endif
 }

data/ext/gtk2/rbgtktreemodelsort.c

@@ -87,13 +87,11 @@ rg_clear_cache(VALUE self)
     return self;
 }
 
-#if GTK_CHECK_VERSION(2,2,0)
 static VALUE
 rg_iter_is_valid_p(VALUE self, VALUE iter)
 {
     return CBOOL2RVAL(gtk_tree_model_sort_iter_is_valid(_SELF(self), RVAL2GTKTREEITER(iter)));
 }
-#endif
 
 void 
 Init_gtk_tmodelsort(VALUE mGtk)
@@ -109,8 +107,6 @@ Init_gtk_tmodelsort(VALUE mGtk)
     RG_DEF_METHOD(convert_iter_to_child_iter, 1);
     RG_DEF_METHOD(reset_default_sort_func, 0);
     RG_DEF_METHOD(clear_cache, 0);
-#if GTK_CHECK_VERSION(2,2,0)
     RG_DEF_METHOD_P(iter_is_valid, 1);
-#endif
 
 }

data/ext/gtk2/rbgtktreerowreference.c

@@ -94,7 +94,6 @@ rg_path(VALUE self)
     return ret;
 }
 
-#if GTK_CHECK_VERSION(2,8,0)
 static VALUE
 rg_model(VALUE self)
 {
@@ -102,7 +101,6 @@ rg_model(VALUE self)
     G_CHILD_SET(self, id_model, ret);
     return ret;
 }
-#endif
 
 static VALUE
 rg_valid_p(VALUE self)
@@ -160,9 +158,7 @@ Init_gtk_treerowreference(VALUE mGtk)
 
     RG_DEF_METHOD(initialize, -1);
     RG_DEF_METHOD(path, 0);
-#if GTK_CHECK_VERSION(2,8,0)
     RG_DEF_METHOD(model, 0);
-#endif
     RG_DEF_METHOD_P(valid, 0);
 
     RG_DEF_SMETHOD(inserted, 2);

data/ext/gtk2/rbgtktreeselection.c

@@ -160,7 +160,6 @@ rg_select_range(VALUE self, VALUE start_path, VALUE end_path)
     return self;
 }
 
-#if GTK_CHECK_VERSION(2,2,0)
 static VALUE
 rg_selected_rows(VALUE self)
 {
@@ -185,7 +184,6 @@ rg_unselect_range(VALUE self, VALUE start_path, VALUE end_path)
                                       RVAL2GTKTREEPATH(end_path));
     return self;
 }
-#endif
 
 void
 Init_gtk_treeselection(VALUE mGtk)
@@ -207,11 +205,9 @@ Init_gtk_treeselection(VALUE mGtk)
     RG_DEF_METHOD(select_all, 0);
     RG_DEF_METHOD(unselect_all, 0);
     RG_DEF_METHOD(select_range, 2);
-#if GTK_CHECK_VERSION(2,2,0)
     RG_DEF_METHOD(selected_rows, 0);
     RG_DEF_METHOD(count_selected_rows, 0);
     RG_DEF_METHOD(unselect_range, 2);
-#endif
 
     G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 }

data/ext/gtk2/rbgtktreestore.c

@@ -94,12 +94,7 @@ static VALUE
 rg_remove(VALUE self, VALUE iter)
 {
     G_CHILD_REMOVE(self, iter);
-#if GTK_CHECK_VERSION(2,2,0)
     return CBOOL2RVAL(gtk_tree_store_remove(_SELF(self), RVAL2GTKTREEITER(iter)));
-#else
-    gtk_tree_store_remove(_SELF(self), RVAL2GTKTREEITER(iter));
-    return Qtrue;
-#endif
 }
 
 static VALUE
@@ -119,7 +114,6 @@ rg_insert(int argc, VALUE *argv, VALUE self)
         ret = GTKTREEITER2RVAL(&iter);
         G_CHILD_ADD(self, ret);
     } else {
-#if GTK_CHECK_VERSION(2,10,0)
         gint *c_columns;
         GValue *c_values;
         long size, i;
@@ -176,15 +170,6 @@ rg_insert(int argc, VALUE *argv, VALUE self)
             G_CHILD_ADD(ret, rbgobj_gvalue_to_rvalue(&(c_values[i])));
             g_value_unset(&(c_values[i]));
         }
-#else
-        rb_warn("Gtk::TreeStore#insert(parent, position, values) requires GTK+-2.10.0 or later");
-        gtk_tree_store_insert(model, &iter, 
-                              NIL_P(parent) ? NULL : RVAL2GTKTREEITER(parent), 
-                              NUM2INT(position));
-        iter.user_data3 = model;
-        ret = GTKTREEITER2RVAL(&iter);
-        G_CHILD_ADD(self, ret);
-#endif
     }
 
     return ret;
@@ -293,7 +278,6 @@ rg_clear(VALUE self)
     return self;
 }
 
-#if GTK_CHECK_VERSION(2,2,0)
 static VALUE
 rg_iter_is_valid_p(VALUE self, VALUE iter)
 {
@@ -348,7 +332,6 @@ rg_move_after(VALUE self, VALUE iter, VALUE position)
                                NIL_P(position) ? NULL : RVAL2GTKTREEITER(position));
     return self;
 }
-#endif
 
 void
 Init_gtk_tree_store(VALUE mGtk)
@@ -370,12 +353,10 @@ Init_gtk_tree_store(VALUE mGtk)
     RG_DEF_METHOD_P(ancestor, 2);
     RG_DEF_METHOD(iter_depth, 1);
     RG_DEF_METHOD(clear, 0);
-#if GTK_CHECK_VERSION(2,2,0)
     RG_DEF_METHOD_P(iter_is_valid, 1);
     RG_DEF_METHOD(reorder, 2);
     RG_DEF_METHOD(swap, 2);
     RG_DEF_METHOD(move_before, 2);
     RG_DEF_METHOD(move_after, 2);
-#endif
 
 }

data/ext/gtk2/rbgtktreeview.c

@@ -257,14 +257,12 @@ rg_expand_row(VALUE self, VALUE path, VALUE open_all)
                                                RVAL2CBOOL(open_all)));
 }
 
-#if GTK_CHECK_VERSION(2,2,0)
 static VALUE
 rg_expand_to_path(VALUE self, VALUE path)
 {
     gtk_tree_view_expand_to_path(_SELF(self), RVAL2GTKTREEPATH(path));
     return self;
 }
-#endif
 
 static VALUE
 rg_collapse_row(VALUE self, VALUE path)
@@ -345,7 +343,6 @@ rg_visible_rect(VALUE self)
     return BOXED2RVAL(&rect, GDK_TYPE_RECTANGLE);
 }
 
-#if GTK_CHECK_VERSION(2,8,0)
 static VALUE
 rg_visible_range(VALUE self)
 {
@@ -357,7 +354,6 @@ rg_visible_range(VALUE self)
     return valid_paths ? rb_assoc_new(GTKTREEPATH2RVAL(start_path),
                                       GTKTREEPATH2RVAL(end_path)) : Qnil;
 }
-#endif
 
 static VALUE
 rg_bin_window(VALUE self)
@@ -571,7 +567,6 @@ treeview_signal_func(G_GNUC_UNUSED guint num, const GValue *values)
     return rb_ary_new3(3, GOBJ2RVAL(view), GTKTREEITER2RVAL(iter), GVAL2RVAL(&values[2]));
 }
 
-#if GTK_CHECK_VERSION(2,2,0)
 static VALUE
 rg_set_cursor_on_cell(VALUE self, VALUE path, VALUE focus_column, VALUE focus_cell, VALUE start_editing)
 {
@@ -581,14 +576,12 @@ rg_set_cursor_on_cell(VALUE self, VALUE path, VALUE focus_column, VALUE focus_ce
                                      RVAL2CBOOL(start_editing));
     return self;
 }
-#endif
 
 /* How can I implement this?
 GtkTreeViewRowSeparatorFunc gtk_tree_view_get_row_separator_func
                                             (GtkTreeView *tree_view);
 */
 
-#if GTK_CHECK_VERSION(2,6,0)
 static gboolean
 row_separator_func(GtkTreeModel *model, GtkTreeIter *iter, gpointer func)
 {
@@ -611,9 +604,7 @@ rg_set_row_separator_func(VALUE self)
                                          (GtkDestroyNotify)NULL);
     return self;
 }
-#endif
 
-#if GTK_CHECK_VERSION(2,10,0)
 static VALUE
 rg_search_entry(VALUE self)
 {
@@ -676,8 +667,6 @@ rg_set_search_position_func(VALUE self)
     return self;
 }
 
-#endif
-
 void 
 Init_gtk_treeview(VALUE mGtk)
 {
@@ -704,9 +693,7 @@ Init_gtk_treeview(VALUE mGtk)
     RG_DEF_METHOD(collapse_all, 0);
     RG_DEF_METHOD(expand_row, 2);
     RG_DEF_METHOD(collapse_row, 1);
-#if GTK_CHECK_VERSION(2,2,0)
     RG_DEF_METHOD(expand_to_path, 1);
-#endif
     RG_DEF_METHOD(map_expanded_rows, 0);
     RG_DEF_METHOD_P(row_expanded, 1);
     RG_DEF_METHOD(get_path_at_pos, 2);
@@ -714,10 +701,7 @@ Init_gtk_treeview(VALUE mGtk)
     RG_DEF_METHOD(get_cell_area, 2);
     RG_DEF_METHOD(get_background_area, 2);
     RG_DEF_METHOD(visible_rect, 0);
-#if GTK_CHECK_VERSION(2,8,0)
     RG_DEF_METHOD(visible_range, 0);
-#endif
-
     RG_DEF_METHOD(bin_window, 0);
     RG_DEF_METHOD(widget_to_tree_coords, 2);
     RG_DEF_METHOD(tree_to_widget_coords, 2);
@@ -739,28 +723,20 @@ Init_gtk_treeview(VALUE mGtk)
     RG_DEF_ALIAS("get_dest_row", "get_dest_row_at_pos");
     RG_DEF_METHOD(create_row_drag_icon, 1);
     RG_DEF_METHOD(set_search_equal_func, 0);
-#if GTK_CHECK_VERSION(2,2,0)
     RG_DEF_METHOD(set_cursor_on_cell, 4);
-#endif
 
-#if GTK_CHECK_VERSION(2,6,0)
     RG_DEF_METHOD(set_row_separator_func, 0);
-#endif
-#if GTK_CHECK_VERSION(2,10,0)
     RG_DEF_METHOD(search_entry, 0);
     RG_DEF_METHOD(set_search_entry, 1);
     RG_DEF_METHOD(set_search_position_func, 0);
-#endif
 
     /* Constants */
     G_DEF_CLASS(GTK_TYPE_TREE_VIEW_DROP_POSITION, "DropPosition", RG_TARGET_NAMESPACE);
     G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GTK_TYPE_TREE_VIEW_DROP_POSITION, "GTK_TREE_VIEW_");
 
-#if GTK_CHECK_VERSION(2,10,0)
     /* GtkTreeViewGridLines */
     G_DEF_CLASS(GTK_TYPE_TREE_VIEW_GRID_LINES, "GridLines", RG_TARGET_NAMESPACE);
     G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GTK_TYPE_TREE_VIEW_GRID_LINES, "GTK_TREE_VIEW_");
-#endif
 
     /* Option Signals */
     G_DEF_SIGNAL_FUNC(RG_TARGET_NAMESPACE, "row-collapsed", (GValToRValSignalFunc)treeview_signal_func);

data/ext/gtk2/rbgtktreeviewcolumn.c

@@ -217,8 +217,6 @@ rg_cell_is_visible_p(VALUE self)
     return CBOOL2RVAL(gtk_tree_view_column_cell_is_visible(_SELF(self)));
 }
 
-#if GTK_CHECK_VERSION(2,2,0)
-
 static VALUE
 rg_focus_cell(VALUE self, VALUE renderer)
 {
@@ -227,16 +225,12 @@ rg_focus_cell(VALUE self, VALUE renderer)
     return self;
 }
 
-#endif
-
-#if GTK_CHECK_VERSION(2,8,0)
 static VALUE
 rg_queue_resize(VALUE self)
 {
     gtk_tree_view_column_queue_resize(_SELF(self));
     return self;
 }
-#endif
 
 #if GTK_CHECK_VERSION(2,12,0)
 static VALUE
@@ -279,12 +273,8 @@ Init_gtk_treeviewcolumn(VALUE mGtk)
     RG_DEF_METHOD(cell_set_cell_data, 4);
     RG_DEF_METHOD(cell_size, 0);
     RG_DEF_METHOD_P(cell_is_visible, 0);
-#if GTK_CHECK_VERSION(2,2,0)
     RG_DEF_METHOD(focus_cell, 1);
-#endif
-#if GTK_CHECK_VERSION(2,8,0)
     RG_DEF_METHOD(queue_resize, 0);
-#endif
 #if GTK_CHECK_VERSION(2,12,0)
     RG_DEF_METHOD(tree_view, 0);
 #endif

data/ext/gtk2/rbgtkuimanager.c

@@ -21,8 +21,6 @@
 
 #include "global.h"
 
-#if GTK_CHECK_VERSION(2,4,0)
-
 #define RG_TARGET_NAMESPACE cUIManager
 #define _SELF(self) (GTK_UI_MANAGER(RVAL2GOBJ(self)))
 
@@ -162,12 +160,10 @@ rbuimanager_mark(void *p)
 
     rbgobj_gc_mark_instance(gtk_ui_manager_get_accel_group(manager));
 }
-#endif
 
 void
 Init_gtk_uimanager(VALUE mGtk)
 {
-#if GTK_CHECK_VERSION(2,4,0)
     VALUE RG_TARGET_NAMESPACE;
 
     RG_TARGET_NAMESPACE = G_DEF_CLASS_WITH_GC_FUNC(GTK_TYPE_UI_MANAGER, "UIManager", mGtk,
@@ -190,6 +186,4 @@ Init_gtk_uimanager(VALUE mGtk)
     /* GtkUIManagerItemType */
     G_DEF_CLASS(GTK_TYPE_UI_MANAGER_ITEM_TYPE, "ItemType", RG_TARGET_NAMESPACE);
     G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GTK_TYPE_UI_MANAGER_ITEM_TYPE, "GTK_UI_MANAGER_");
-
-#endif
 }

data/ext/gtk2/rbgtkwidget.c

@@ -133,14 +133,12 @@ rg_queue_resize(VALUE self)
     return self;
 }
 
-#if GTK_CHECK_VERSION(2,4,0)
 static VALUE
 rg_queue_resize_no_redraw(VALUE self)
 {
     gtk_widget_queue_resize_no_redraw(_SELF(self));
     return self;
 }
-#endif
 
 /* Note this method is not
    gtk_widget_get_size_request */
@@ -203,13 +201,11 @@ rg_accel_closures(VALUE self)
     return GLIST2ARY2F(gtk_widget_list_accel_closures(_SELF(self)), G_TYPE_CLOSURE);
 }
 
-#if GTK_CHECK_VERSION(2,4,0)
 static VALUE
 rg_can_activate_accel_p(VALUE self, VALUE signal_id)
 {
     return CBOOL2RVAL(gtk_widget_can_activate_accel(_SELF(self), NUM2UINT(signal_id)));
 }
-#endif
 
 static VALUE
 rg_event(VALUE self, VALUE event)
@@ -431,7 +427,6 @@ rg_shape_combine_mask(VALUE self, VALUE shape_mask, VALUE offset_x, VALUE offset
     return self;
 }
 
-#if GTK_CHECK_VERSION(2,10,0)
 static VALUE
 rg_input_shape_combine_mask(VALUE self, VALUE shape_mask, VALUE offset_x, VALUE offset_y)
 {
@@ -441,7 +436,6 @@ rg_input_shape_combine_mask(VALUE self, VALUE shape_mask, VALUE offset_x, VALUE
                                         NUM2INT(offset_y));
     return self;
 }
-#endif
 
 static VALUE
 rg_path(VALUE self)
@@ -681,7 +675,6 @@ rg_s_install_style_property(VALUE self, VALUE spec)
     return self;
 }
 
-#if GTK_CHECK_VERSION(2,2,0)
 static VALUE
 rg_s_style_property(VALUE self, VALUE property_name)
 {
@@ -735,7 +728,6 @@ rg_s_style_properties(int argc, VALUE *argv, VALUE self)
     g_type_class_unref(oclass);
     return ary;
 }
-#endif
 
 static VALUE
 rg_region_intersect(VALUE self, VALUE region)
@@ -771,9 +763,8 @@ rg_style_get_property(VALUE self, VALUE prop_name)
     } else {
         name = RVAL2CSTR(prop_name);
     }
-#if GTK_CHECK_VERSION(2,2,0)
     pspec = gtk_widget_class_find_style_property((GtkWidgetClass*)g_type_class_ref(RVAL2GTYPE(self)), name);
-#endif
+
     if (!pspec)
         rb_raise(rb_eval_string("GLib::NoPropertyError"), "No such property: %s", name);
     else {
@@ -841,7 +832,6 @@ rg_settings(VALUE self)
     return GOBJ2RVAL(gtk_widget_get_settings(_SELF(self)));
 }
 
-#if GTK_CHECK_VERSION(2,2,0)
 static VALUE
 rg_get_clipboard(VALUE self, VALUE selection)
 {
@@ -871,7 +861,6 @@ rg_has_screen_p(VALUE self)
 {
     return CBOOL2RVAL(gtk_widget_has_screen(_SELF(self)));
 }
-#endif
 
 /*
   Note this method is not gtk_widget_size_request()
@@ -905,8 +894,6 @@ rg_thaw_child_notify(VALUE self)
     return self;
 }
 
-#if GTK_CHECK_VERSION(2,4,0)
-
 static VALUE
 rg_mnemonic_labels(VALUE self)
 {
@@ -926,7 +913,6 @@ rg_remove_mnemonic_label(VALUE self, VALUE label)
     gtk_widget_remove_mnemonic_label(_SELF(self), GTK_WIDGET(RVAL2GOBJ(label)));
     return self;
 }
-#endif
 
 #if GTK_CHECK_VERSION(2,12,0)
 static VALUE
@@ -951,7 +937,6 @@ rg_trigger_tooltip_query(VALUE self)
 
 #endif
 
-#if GTK_CHECK_VERSION(2,10,0)
 static VALUE
 rg_action(VALUE self)
 {
@@ -969,7 +954,6 @@ rg_window(VALUE self)
 {
     return GOBJ2RVAL(_SELF(self)->window);
 }
-#endif
 
 static VALUE
 rg_set_window(VALUE self, VALUE window)
@@ -1084,9 +1068,7 @@ Init_gtk_widget(VALUE mGtk)
     RG_DEF_METHOD(unrealize, 0);
     RG_DEF_METHOD(queue_draw, 0);
     RG_DEF_METHOD(queue_resize, 0);
-#if GTK_CHECK_VERSION(2,4,0)
     RG_DEF_METHOD(queue_resize_no_redraw, 0);
-#endif
     RG_DEF_METHOD(size_request, 0);
     RG_DEF_METHOD(child_requisition, 0);
     RG_DEF_METHOD(size_allocate, 1);
@@ -1094,17 +1076,13 @@ Init_gtk_widget(VALUE mGtk)
     RG_DEF_METHOD(remove_accelerator, 3);
     RG_DEF_METHOD(set_accel_path, 2);
     RG_DEF_METHOD(accel_closures, 0);
-#if GTK_CHECK_VERSION(2,4,0)
     RG_DEF_METHOD_P(can_activate_accel, 1);
-#endif
     RG_DEF_METHOD(event, 1);
     RG_DEF_METHOD(activate, 0);
     RG_DEF_METHOD(reparent, 1);
     RG_DEF_SMETHOD(install_style_property, 1);
-#if GTK_CHECK_VERSION(2,2,0)
     RG_DEF_SMETHOD(style_property, 1);
     RG_DEF_SMETHOD(style_properties, -1);
-#endif
     RG_DEF_METHOD(intersect, 1);
     RG_DEF_METHOD(grab_default, 0);
     RG_DEF_METHOD(set_state, 1);
@@ -1125,9 +1103,7 @@ Init_gtk_widget(VALUE mGtk)
     RG_DEF_METHOD(set_direction, 1);
     RG_DEF_METHOD(direction, 0);
     RG_DEF_METHOD(shape_combine_mask, 3);
-#if GTK_CHECK_VERSION(2,10,0)
     RG_DEF_METHOD(input_shape_combine_mask, 3);
-#endif
     RG_DEF_METHOD(path, 0);
     RG_DEF_METHOD(class_path, 0);
     RG_DEF_METHOD(composite_name, 0);
@@ -1166,32 +1142,26 @@ Init_gtk_widget(VALUE mGtk)
     RG_DEF_METHOD(freeze_child_notify, 0);
     RG_DEF_METHOD_P(child_visible, 0);
     RG_DEF_METHOD(settings, 0);
-#if GTK_CHECK_VERSION(2,2,0)
     RG_DEF_METHOD(get_clipboard, 1);
     RG_DEF_METHOD(display, 0);
     RG_DEF_METHOD(root_window, 0);
     RG_DEF_METHOD(screen, 0);
     RG_DEF_METHOD_P(has_screen, 0);
-#endif
     RG_DEF_METHOD(set_child_visible, 1);
     RG_DEF_METHOD(get_size_request, 0);
     RG_DEF_METHOD(set_size_request, 2);
     RG_DEF_METHOD(thaw_child_notify, 0);
-#if GTK_CHECK_VERSION(2,4,0)
     RG_DEF_METHOD(mnemonic_labels, 0);
     RG_DEF_METHOD(add_mnemonic_label, 1);
     RG_DEF_METHOD(remove_mnemonic_label, 1);
-#endif
 #if GTK_CHECK_VERSION(2,12,0)
     RG_DEF_METHOD(set_tooltip_window, 1);
     RG_DEF_METHOD(tooltip_window, 0);
     RG_DEF_METHOD(trigger_tooltip_query, 0);
 #endif
-#if GTK_CHECK_VERSION(2,10,0)
     RG_DEF_METHOD(action, 0);
     RG_DEF_METHOD_P(composited, 0);
     RG_DEF_METHOD(window, 0);
-#endif
     RG_DEF_METHOD(set_window, 1);
     RG_DEF_METHOD(allocation, 0);
     RG_DEF_METHOD(set_allocation, 4);