gtk2 2.0.2 → 2.0.3

data/ext/gtk2/rbgdkx11.c

@@ -103,12 +103,7 @@ rg_m_xid_table_lookup(int argc, VALUE *argv, VALUE self)
         win = gdk_xid_table_lookup(NUM2UINT(arg[0]));
         break;
       case 2:
-#if GTK_CHECK_VERSION(2,2,0)
-        win = gdk_xid_table_lookup_for_display(RVAL2GOBJ(arg[0]), NUM2UINT(arg[1])); 
-#else
-        win = gdk_xid_table_lookup(NUM2UINT(arg[1])); 
-        rb_warn("Not supported in GTK+-2.0.x.");
-#endif
+        win = gdk_xid_table_lookup_for_display(RVAL2GOBJ(arg[0]), NUM2UINT(arg[1]));
         break;
     }
     if (win == NULL)

data/ext/gtk2/rbgtkaboutdialog.c

@@ -21,8 +21,6 @@
 
 #include "global.h"
 
-#if GTK_CHECK_VERSION(2,6,0)
-
 #define RG_TARGET_NAMESPACE cAboutDialog
 #define _SELF(self) (GTK_ABOUT_DIALOG(RVAL2GOBJ(self)))
 
@@ -125,17 +123,14 @@ rg_s_show(VALUE self, VALUE parent, VALUE props)
                           NULL);
     return self;
 }
-#endif
 
 void 
 Init_gtk_aboutdialog(VALUE mGtk)
 {
-#if GTK_CHECK_VERSION(2,6,0)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_ABOUT_DIALOG, "AboutDialog", mGtk);
     RG_DEF_METHOD(initialize, 0);
 
     RG_DEF_SMETHOD(set_email_hook, 0);
     RG_DEF_SMETHOD(set_url_hook, 0);
     RG_DEF_SMETHOD(show, 2);
-#endif
 }

data/ext/gtk2/rbgtkaccelerator.c

@@ -46,13 +46,11 @@ rg_s_to_name(G_GNUC_UNUSED VALUE self, VALUE key, VALUE mods)
     return CSTR2RVAL(gtk_accelerator_name(NUM2UINT(key), RVAL2MOD(mods)));
 }
 
-#if GTK_CHECK_VERSION(2,6,0)
 static VALUE
 rg_s_get_label(G_GNUC_UNUSED VALUE self, VALUE key, VALUE mods)
 {
     return CSTR2RVAL(gtk_accelerator_get_label(NUM2UINT(key), RVAL2MOD(mods)));
 }
-#endif
 
 static VALUE
 rg_s_set_default_mod_mask(VALUE self, VALUE default_mod_mask)
@@ -76,9 +74,7 @@ Init_gtk_accelerator(VALUE mGtk)
     RG_DEF_SMETHOD(parse, 1);
     /* name is reserved by Ruby */
     RG_DEF_SMETHOD(to_name, 2);
-#if GTK_CHECK_VERSION(2,6,0)
     RG_DEF_SMETHOD(get_label, 2);
-#endif
     RG_DEF_SMETHOD(set_default_mod_mask, 1);
     RG_DEF_SMETHOD(default_mod_mask, 0);
     G_DEF_SETTERS(RG_TARGET_NAMESPACE);

data/ext/gtk2/rbgtkaccelgroup.c

@@ -108,7 +108,6 @@ rg_s_from_accel_closure(G_GNUC_UNUSED VALUE self, VALUE closure)
                          (GClosure*)RVAL2BOXED(closure, G_TYPE_CLOSURE)));
 }
 
-#if GTK_CHECK_VERSION(2,2,0)
 static gboolean
 gaccelgrp_find_func(GtkAccelKey *key, GClosure *closure, gpointer func)
 {
@@ -128,9 +127,7 @@ rg_find(VALUE self)
                                   (gpointer)func);
     return BOXED2RVAL(result, GTK_TYPE_ACCEL_KEY);
 }
-#endif
 
-#if GTK_CHECK_VERSION(2,4,0)
 static VALUE
 rg_activate(VALUE self, VALUE accel_quark, VALUE acceleratable, VALUE accel_key, VALUE accel_mods)
 {
@@ -143,7 +140,6 @@ rg_activate(VALUE self, VALUE accel_quark, VALUE acceleratable, VALUE accel_key,
     return CBOOL2RVAL(gtk_accel_group_activate(_SELF(self), quark, RVAL2GOBJ(acceleratable),
                                                NUM2UINT(accel_key), RVAL2MOD(accel_mods)));
 }
-#endif
 
 static VALUE
 _gaccelgrp_lock_ensure(VALUE self)
@@ -193,16 +189,12 @@ Init_gtk_accel_group(VALUE mGtk)
     RG_DEF_SMETHOD(from_object, 1);
     RG_DEF_SMETHOD(from_accel_closure, 1);
     RG_DEF_METHOD(initialize, 0);
-#if GTK_CHECK_VERSION(2,4,0)
     RG_DEF_METHOD(activate, 4);
-#endif
     RG_DEF_METHOD(lock, 0);
     RG_DEF_METHOD(unlock, 0);
     RG_DEF_METHOD(connect, -1);
     RG_DEF_METHOD(disconnect, 1);
     RG_DEF_METHOD(disconnect_key, 2);
     RG_DEF_METHOD(query, 2);
-#if GTK_CHECK_VERSION(2,2,0)
     RG_DEF_METHOD(find, 0);
-#endif
 }

data/ext/gtk2/rbgtkaccelmap.c

@@ -105,7 +105,6 @@ void        gtk_accel_map_load_fd           (gint fd);
 void        gtk_accel_map_save_fd           (gint fd);
 */
 
-#if GTK_CHECK_VERSION(2,4,0)
 static VALUE
 rg_s_get(G_GNUC_UNUSED VALUE self)
 {
@@ -125,12 +124,10 @@ rg_s_unlock_path(VALUE self, VALUE accel_path)
     gtk_accel_map_unlock_path(RVAL2CSTR(accel_path));
     return self;
 }
-#endif
 
 void
 Init_gtk_accel_map(VALUE mGtk)
 {
-#if GTK_CHECK_VERSION(2,4,0)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_ACCEL_MAP, "AccelMap", mGtk);
 
     RG_DEF_SMETHOD(add_entry, 3);
@@ -144,16 +141,4 @@ Init_gtk_accel_map(VALUE mGtk)
     RG_DEF_SMETHOD(get, 0);
     RG_DEF_SMETHOD(lock_path, 1);
     RG_DEF_SMETHOD(unlock_path, 1);
-#else
-    VALUE mAccelMap = rb_define_module_under(mGtk, "AccelMap");
-
-    rb_define_module_function(mAccelMap, "add_entry", rg_s_add_entry, 3);
-    rb_define_module_function(mAccelMap, "lookup_entry", rg_s_lookup_entry, 1);
-    rb_define_module_function(mAccelMap, "change_entry", rg_s_change_entry, 4);
-    rb_define_module_function(mAccelMap, "load", rg_s_load, 1);
-    rb_define_module_function(mAccelMap, "save", rg_s_save, 1);
-    rb_define_module_function(mAccelMap, "add_filter", rg_s_add_filter, 1);
-    rb_define_module_function(mAccelMap, "each", rg_s_each, 0);
-    rb_define_module_function(mAccelMap, "each_unfilterd", rg_s_each_unfilterd, 0);
-#endif
 }

data/ext/gtk2/rbgtkaction.c

@@ -21,8 +21,6 @@
 
 #include "global.h"
 
-#if GTK_CHECK_VERSION(2,4,0)
-
 #define RG_TARGET_NAMESPACE cAction
 #define _SELF(self) (GTK_ACTION(RVAL2GOBJ(self)))
 #define RVAL2WIDGET(w) (GTK_WIDGET(RVAL2GOBJ(w)))
@@ -156,21 +154,17 @@ rg_set_accel_group(VALUE self, VALUE accel_group)
     return self;
 }
 
-#if GTK_CHECK_VERSION(2,6,0)
 static VALUE
 rg_accel_path(VALUE self)
 {
     return CSTR2RVAL(gtk_action_get_accel_path(_SELF(self)));
 }
-#endif
 
-#if GTK_CHECK_VERSION(2,8,0)
 static VALUE
 rg_accel_closure(VALUE self)
 {
     return BOXED2RVAL(gtk_action_get_accel_closure(_SELF(self)), G_TYPE_CLOSURE);
 }
-#endif
 
 static void
 action_mark(void *p)
@@ -186,12 +180,10 @@ action_mark(void *p)
         rbgobj_gc_mark_instance(proxy);
     }
 }
-#endif
 
 void
 Init_gtk_action(VALUE mGtk)
 {
-#if GTK_CHECK_VERSION(2,4,0)
     VALUE RG_TARGET_NAMESPACE;
 
     RG_TARGET_NAMESPACE = G_DEF_CLASS_WITH_GC_FUNC(GTK_TYPE_ACTION, "Action", mGtk,
@@ -226,12 +218,6 @@ Init_gtk_action(VALUE mGtk)
     RG_DEF_METHOD(set_accel_group, 1);
     G_DEF_SETTER(RG_TARGET_NAMESPACE, "accel_group");
 
-#if GTK_CHECK_VERSION(2,6,0)
     RG_DEF_METHOD(accel_path, 0);
-#endif
-
-#if GTK_CHECK_VERSION(2,8,0)
     RG_DEF_METHOD(accel_closure, 0);
-#endif
-#endif
 }

data/ext/gtk2/rbgtkactiongroup.c

@@ -21,8 +21,6 @@
 
 #include "global.h"
 
-#if GTK_CHECK_VERSION(2,4,0)
-
 static ID id_action_procs;
 static ID id_toggle_action_procs;
 
@@ -423,13 +421,11 @@ rg_set_translation_domain(VALUE self, VALUE domain)
     return self;
 }
 
-#if GTK_CHECK_VERSION(2,6,0)
 static VALUE
 rg_translate_string(VALUE self, VALUE str)
 {
     return CSTR2RVAL(gtk_action_group_translate_string(_SELF(self), RVAL2CSTR(str)));
 }
-#endif
 
 static void
 action_group_mark(void *p)
@@ -445,12 +441,10 @@ action_group_mark(void *p)
     }
     g_list_free(actions);
 }
-#endif
 
 void 
 Init_gtk_actiongroup(VALUE mGtk)
 {
-#if GTK_CHECK_VERSION(2,4,0)
     VALUE RG_TARGET_NAMESPACE;
 
     RG_TARGET_NAMESPACE = G_DEF_CLASS_WITH_GC_FUNC(GTK_TYPE_ACTION_GROUP, "ActionGroup",
@@ -470,8 +464,5 @@ Init_gtk_actiongroup(VALUE mGtk)
     RG_DEF_METHOD(set_translate_func, 0);
     RG_DEF_METHOD(set_translation_domain, 1);
     G_DEF_SETTER(RG_TARGET_NAMESPACE, "translation_domain");
-#if GTK_CHECK_VERSION(2,6,0)
     RG_DEF_METHOD(translate_string, 1);
-#endif
-#endif
 }

data/ext/gtk2/rbgtkalignment.c

@@ -44,7 +44,6 @@ rg_set(VALUE self, VALUE xalign, VALUE yalign, VALUE xscale, VALUE yscale)
                       NUM2DBL(xscale), NUM2DBL(yscale));
     return self;
 }
-#if GTK_CHECK_VERSION(2,4,0)
 static VALUE
 rg_padding(VALUE self)
 {
@@ -62,7 +61,6 @@ rg_set_padding(VALUE self, VALUE top, VALUE bottom, VALUE left, VALUE right)
                               NUM2UINT(left), NUM2UINT(right));
     return self;
 }
-#endif
 
 void 
 Init_gtk_alignment(VALUE mGtk)
@@ -71,9 +69,7 @@ Init_gtk_alignment(VALUE mGtk)
 
     RG_DEF_METHOD(initialize, 4);
     RG_DEF_METHOD(set, 4);
-#if GTK_CHECK_VERSION(2,4,0)
     RG_DEF_METHOD(padding, 0);
     RG_DEF_METHOD(set_padding, 4);
-#endif
 
 }

data/ext/gtk2/rbgtkassistant.c

@@ -21,8 +21,6 @@
 
 #include "global.h"
 
-#if GTK_CHECK_VERSION(2,10,0)
-
 #define RG_TARGET_NAMESPACE cAssistant
 #define _SELF(s) (GTK_ASSISTANT(RVAL2GOBJ(s)))
 
@@ -185,12 +183,9 @@ rg_commit(VALUE self)
     return self;
 }
 
-#endif
-
 void
 Init_gtk_assistant(VALUE mGtk)
 {
-#if GTK_CHECK_VERSION(2,10,0)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_ASSISTANT, "Assistant", mGtk);
     RG_DEF_METHOD(initialize, 0);
 
@@ -222,5 +217,4 @@ Init_gtk_assistant(VALUE mGtk)
     /* GtkAssistantPageType */
     G_DEF_CLASS(GTK_TYPE_ASSISTANT_PAGE_TYPE, "PageType", RG_TARGET_NAMESPACE);
     G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GTK_TYPE_ASSISTANT_PAGE_TYPE, "GTK_ASSISTANT_");
-#endif
 }

data/ext/gtk2/rbgtkbbox.c

@@ -34,23 +34,19 @@ rg_set_child_secondary(VALUE self, VALUE child, VALUE is_secondary)
                                        RVAL2CBOOL(is_secondary));
     return self;
 }
-#if GTK_CHECK_VERSION(2,4,0)
 static VALUE
 rg_get_child_secondary(VALUE self, VALUE child)
 {
     return CBOOL2RVAL(gtk_button_box_get_child_secondary(GTK_BUTTON_BOX(RVAL2GOBJ(self)), 
                                                          GTK_WIDGET(RVAL2GOBJ(child))));
 }
-#endif
 
 void 
 Init_gtk_button_box(VALUE mGtk)
 {
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_BUTTON_BOX, "ButtonBox", mGtk);
     RG_DEF_METHOD(set_child_secondary, 2);
-#if GTK_CHECK_VERSION(2,4,0)
     RG_DEF_METHOD(get_child_secondary, 1);
-#endif
     /* GtkButtonBoxStyle(General constants) */
     G_DEF_CLASS(GTK_TYPE_BUTTON_BOX_STYLE, "Style", RG_TARGET_NAMESPACE);
     G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GTK_TYPE_BUTTON_BOX_STYLE, "GTK_BUTTONBOX_");

data/ext/gtk2/rbgtkbutton.c

@@ -82,7 +82,6 @@ rg_leave(VALUE self)
     return self;
 }
 
-#if GTK_CHECK_VERSION(2,4,0)
 static VALUE
 rg_set_alignment(VALUE self, VALUE xalign, VALUE yalign)
 {
@@ -98,7 +97,6 @@ rg_alignment(VALUE self)
 
     return rb_assoc_new(rb_float_new(xalign), rb_float_new(yalign));
 }
-#endif
 
 void 
 Init_gtk_button(VALUE mGtk)
@@ -111,9 +109,7 @@ Init_gtk_button(VALUE mGtk)
     RG_DEF_METHOD(enter, 0);
     RG_DEF_METHOD(leave, 0);
 
-#if GTK_CHECK_VERSION(2,4,0)
     RG_DEF_METHOD(set_alignment, 2);
     G_DEF_SETTER(RG_TARGET_NAMESPACE, "alignment");
     RG_DEF_METHOD(alignment, 0);
-#endif
 }

data/ext/gtk2/rbgtkcalendar.c

@@ -106,12 +106,8 @@ rg_display_options(int argc, VALUE *argv, VALUE self)
     rb_scan_args(argc, argv, "01", &flags);
 
     if (NIL_P(flags)){
-#if GTK_CHECK_VERSION(2,4,0)
         return GFLAGS2RVAL(gtk_calendar_get_display_options(_SELF(self)),
                            GTK_TYPE_CALENDAR_DISPLAY_OPTIONS);
-#else
-        rb_warn("Gtk::Calendar#display_options has supported since GTK+-2.4.");
-#endif
     } else {
         /* This is for backward compatibility. */
         rb_warning("Gtk::Calendar#display_options(flags) has been deprecated. Use Gtk::Calendar#set_display_options(flags).");
@@ -121,7 +117,6 @@ rg_display_options(int argc, VALUE *argv, VALUE self)
     return self;
 }
 
-#if GTK_CHECK_VERSION(2,4,0)
 static VALUE
 rg_set_display_options(VALUE self, VALUE flags)
 {
@@ -130,7 +125,6 @@ rg_set_display_options(VALUE self, VALUE flags)
                                                  GTK_TYPE_CALENDAR_DISPLAY_OPTIONS));
     return self;
 }
-#endif
 
 void 
 Init_gtk_calendar(VALUE mGtk)
@@ -147,10 +141,8 @@ Init_gtk_calendar(VALUE mGtk)
     RG_DEF_METHOD(freeze, 0);
     RG_DEF_METHOD(thaw, 0);
     RG_DEF_METHOD(display_options, -1);
-#if GTK_CHECK_VERSION(2,4,0)
     RG_DEF_METHOD(set_display_options, 1);
     G_DEF_SETTER(RG_TARGET_NAMESPACE, "display_options");
-#endif
 
     G_DEF_CLASS(GTK_TYPE_CALENDAR_DISPLAY_OPTIONS, "DisplayOptions", RG_TARGET_NAMESPACE);
     G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GTK_TYPE_CALENDAR_DISPLAY_OPTIONS, "GTK_CALENDAR_");

data/ext/gtk2/rbgtkcelllayout.c

@@ -21,8 +21,6 @@
 
 #include "global.h"
 
-#if GTK_CHECK_VERSION(2,4,0)
-
 #define RG_TARGET_NAMESPACE mCellLayout
 #define _SELF(s) (GTK_CELL_LAYOUT(RVAL2GOBJ(s)))
 #define RVAL2RENDERER(s) (GTK_CELL_RENDERER(RVAL2GOBJ(s)))
@@ -122,12 +120,10 @@ rg_set_attributes(VALUE self, VALUE cell, VALUE attrs)
     }
     return self;
 }
-#endif
 
 void
 Init_gtk_celllayout(VALUE mGtk)
 {
-#if GTK_CHECK_VERSION(2,4,0)
     VALUE RG_TARGET_NAMESPACE = G_DEF_INTERFACE(GTK_TYPE_CELL_LAYOUT, "CellLayout", mGtk);
 
     RG_DEF_METHOD(pack_start, 2);
@@ -138,5 +134,4 @@ Init_gtk_celllayout(VALUE mGtk)
     RG_DEF_METHOD(set_cell_data_func, 1);
     RG_DEF_METHOD(clear_attributes, 1);
     RG_DEF_METHOD(set_attributes, 2);
-#endif
 }

data/ext/gtk2/rbgtkcellrenderer.c

@@ -73,7 +73,6 @@ rg_start_editing(VALUE self, VALUE event, VALUE widget, VALUE path, VALUE backgr
     return edit ? GOBJ2RVAL(edit) : Qnil;
 }
 
-#if GTK_CHECK_VERSION(2,4,0)
 #ifndef GTK_DISABLE_DEPRECATED
 static VALUE
 rg_editing_canceled(VALUE self)
@@ -82,16 +81,13 @@ rg_editing_canceled(VALUE self)
     return self;
 }
 #endif
-#endif
 
-#if GTK_CHECK_VERSION(2,6,0)
 static VALUE
 rg_stop_editing(VALUE self, VALUE canceled)
 {
     gtk_cell_renderer_stop_editing(_SELF(self), RVAL2CBOOL(canceled));
     return self;
 }
-#endif
 
 static VALUE
 rg_fixed_size(VALUE self)
@@ -118,14 +114,10 @@ Init_gtk_cellrenderer(VALUE mGtk)
     RG_DEF_METHOD(render, 6);
     RG_DEF_METHOD(activate, 6);
     RG_DEF_METHOD(start_editing, 6);
-#if GTK_CHECK_VERSION(2,4,0)
 #ifndef GTK_DISABLE_DEPRECATED
     RG_DEF_METHOD(editing_canceled, 0);
 #endif
-#endif
-#if GTK_CHECK_VERSION(2,6,0)
     RG_DEF_METHOD(stop_editing, 1);
-#endif
     RG_DEF_METHOD(fixed_size, 0);
     RG_DEF_METHOD(set_fixed_size, 2);