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

data/ext/gtk2/rbgdkgc.c

@@ -329,13 +329,11 @@ rg_offset(VALUE self, VALUE x, VALUE y)
     return self;
 }
 
-#if GTK_CHECK_VERSION(2,2,0)
 static VALUE
 rg_screen(VALUE self)
 {
     return GOBJ2RVAL(gdk_gc_get_screen(_SELF(self)));
 }
-#endif
 
 void
 Init_gtk_gdk_gc(VALUE mGdk)
@@ -381,10 +379,7 @@ Init_gtk_gdk_gc(VALUE mGdk)
 
     RG_DEF_METHOD(colormap, 0);
     RG_DEF_METHOD(offset, 2);
-
-#if GTK_CHECK_VERSION(2,2,0)
     RG_DEF_METHOD(screen, 0);
-#endif
 
     G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 

data/ext/gtk2/rbgdkkeymap.c

@@ -29,13 +29,13 @@ rg_s_default(G_GNUC_UNUSED VALUE self)
 {
   return GOBJ2RVAL(gdk_keymap_get_default());
 }
-#if GTK_CHECK_VERSION(2,2,0)
+
 static VALUE
 rg_s_for_display(G_GNUC_UNUSED VALUE self, VALUE display)
 {
   return GOBJ2RVAL(gdk_keymap_get_for_display(GDK_DISPLAY_OBJECT(RVAL2GOBJ(display))));
 }
-#endif
+
 static VALUE
 rg_lookup_key(VALUE self, VALUE keycode, VALUE group, VALUE level)
 {
@@ -138,9 +138,7 @@ Init_gtk_gdk_keymap(VALUE mGdk)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GDK_TYPE_KEYMAP, "Keymap", mGdk);
 
     RG_DEF_SMETHOD(default, 0);
-#if GTK_CHECK_VERSION(2,2,0)
     RG_DEF_SMETHOD(for_display, 0);
-#endif
     RG_DEF_METHOD(lookup_key, 3);
     RG_DEF_METHOD(translate_keyboard_state, 3);
     RG_DEF_METHOD(get_entries_for_keyval, 1);

data/ext/gtk2/rbgdkpango.c

@@ -32,12 +32,7 @@ rg_m_context(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
     if (NIL_P(screen)){
         ret = GOBJ2RVAL(gdk_pango_context_get());
     } else {
-#if GTK_CHECK_VERSION(2,2,0)
         ret = GOBJ2RVAL(gdk_pango_context_get_for_screen(GDK_SCREEN(RVAL2GOBJ(screen))));
-#else
-        rb_warn("Gdk::Pango.context_get: Not supported arguments in GTK+-2.0.x.");
-        ret = GOBJ2RVAL(gdk_pango_context_get());
-#endif
     }
     return ret;
 }

data/ext/gtk2/rbgdkpangorenderer.c

@@ -21,8 +21,6 @@
 
 #include "global.h"
 
-#if GTK_CHECK_VERSION(2,6,0)
-
 #define RG_TARGET_NAMESPACE cPangoRenderer
 #define _SELF(s) (GDK_PANGO_RENDERER(RVAL2GOBJ(s)))
 
@@ -127,12 +125,9 @@ rg_set_override_color(G_GNUC_UNUSED VALUE self,
 }
 #endif
 
-#endif
-
 void
 Init_gtk_gdk_pangorenderer(VALUE mGdk)
 {
-#if GTK_CHECK_VERSION(2,6,0)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GDK_TYPE_PANGO_RENDERER, "PangoRenderer", mGdk);
 
     RG_DEF_METHOD(initialize, -1);
@@ -145,5 +140,4 @@ Init_gtk_gdk_pangorenderer(VALUE mGdk)
     RG_DEF_SMETHOD(default, 0);
 
     G_DEF_SETTERS(RG_TARGET_NAMESPACE);
-#endif
 }

data/ext/gtk2/rbgdkpixbuf.c

@@ -40,10 +40,7 @@ rg_render_to_drawable(int argc, VALUE *argv, VALUE self)
 {
     VALUE gc, src_x, src_y, dest_x, dest_y, width, height,
         dither, x_dither, y_dither;
-
-#if GTK_CHECK_VERSION(2,2,0)
     rb_warn("Gdk::Pixbuf#render_to_drawable is obsolete. Use Gdk::Drawable#draw_pixbuf instead.");
-#endif
 
     rb_scan_args(argc, argv, "73", &gc, &src_x, &src_y, &dest_x, &dest_y,
                  &width, &height, &dither, &x_dither, &y_dither);

data/ext/gtk2/rbgdkpixmap.c

@@ -166,25 +166,15 @@ rg_s_foreign_new(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
             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])), 
-                                                     RVAL2GDKNATIVEWINDOW(arg[1])); 
-#else
-            win = gdk_pixmap_foreign_new(RVAL2GDKNATIVEWINDOW(arg[1])); 
-            rb_warn("Not supported. Use GTK+-2.2.0 or later.");
-#endif
+            win = gdk_pixmap_foreign_new_for_display(GDK_DISPLAY_OBJECT(RVAL2GOBJ(arg[0])),
+                                                     RVAL2GDKNATIVEWINDOW(arg[1]));
             break;
         case 5:
-#if GTK_CHECK_VERSION(2,10,0)
             win = gdk_pixmap_foreign_new_for_screen(GDK_SCREEN(RVAL2GOBJ(arg[0])), 
                                                     RVAL2GDKNATIVEWINDOW(arg[1]), /* anid */
                                                     NUM2INT(arg[2]),  /* width */
                                                     NUM2INT(arg[3]),  /* height */
                                                     NUM2INT(arg[4])); /* depth */
-#else
-            win = gdk_pixmap_foreign_new(NUM2UINT(arg[1])); 
-            rb_warn("Not supported. GTK+-2.10.0 or later.");
-#endif
             break;
         default:
             break;
@@ -206,12 +196,7 @@ rg_s_lookup(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
         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]), RVAL2GDKNATIVEWINDOW(arg[1])); 
-#else
-        win = gdk_pixmap_lookup(RVAL2GDKNATIVEWINDOW(arg[1])); 
-        rb_warn("Not supported in GTK+-2.0.x.");
-#endif
+        win = gdk_pixmap_lookup_for_display(RVAL2GOBJ(arg[0]), RVAL2GDKNATIVEWINDOW(arg[1]));
         break;
     default:
         break;

data/ext/gtk2/rbgdkproperty.c

@@ -43,7 +43,6 @@ rg_m_text_property_to_text_list(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
                                              (const guchar*)RVAL2CSTR(text), 
                                              RSTRING_LEN(text), &list);
     } else {
-#if GTK_CHECK_VERSION(2,2,0)
         VALUE display, encoding, format, text;
         rb_scan_args(argc, argv, "40", &display, &encoding, &format, &text);
         StringValue(text);
@@ -54,15 +53,6 @@ rg_m_text_property_to_text_list(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
                                                          (const guchar*)RVAL2CSTR(text),
                                                          RSTRING_LEN(text),
                                                          &list);
-#else
-        VALUE encoding, format, text;
-        rb_scan_args(argc, argv, "30", &encoding, &format, &text);
-        rb_warn("Gdk::Property.text_property_to_text_list: Not supported arguments in GTK+-2.0.x.");
-        num = gdk_text_property_to_text_list(RVAL2ATOM(encoding),
-                                             NUM2INT(format),
-                                             (const guchar*)RVAL2CSTR(text),
-                                             RSTRING_LEN(text), &list);
-#endif
     }
 
     ret = rb_ary_new2(num);
@@ -90,7 +80,6 @@ rg_m_text_property_to_utf8_list(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
                                              (const guchar*)RVAL2CSTR(text),
                                              RSTRING_LEN(text), &list);
     } else {
-#if GTK_CHECK_VERSION(2,2,0)
         VALUE display, encoding, format, text;
         rb_scan_args(argc, argv, "40", &display, &encoding, &format, &text);
         StringValue(text);
@@ -101,17 +90,6 @@ rg_m_text_property_to_utf8_list(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
                                                          (const guchar*)RVAL2CSTR(text),
                                                          RSTRING_LEN(text),
                                                          &list);
-#else
-        VALUE encoding, format, text;
-        rb_scan_args(argc, argv, "30", &encoding, &format, &text);
-        StringValue(text);
-
-        rb_warn("Gdk::Property.text_property_to_utf8_list: Not supported arguments in GTK+-2.0.x.");
-        num = gdk_text_property_to_utf8_list(RVAL2ATOM(encoding),
-                                             NUM2INT(format),
-                                             (const guchar*)RVAL2CSTR(text),
-                                             RSTRING_LEN(text), &list);
-#endif
     }
 
     ret = rb_ary_new2(num);
@@ -138,7 +116,6 @@ rg_m_string_to_compound_text(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
                                           &encoding, &format,
                                           &ctext, &length);
     } else {
-#if GTK_CHECK_VERSION(2,2,0)
         VALUE display, str;
 
         rb_scan_args(argc, argv, "20", &display, &str);
@@ -146,14 +123,6 @@ rg_m_string_to_compound_text(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
                                                       RVAL2CSTR(str),
                                                       &encoding, &format,
                                                       &ctext, &length);
-#else
-        VALUE str;
-        rb_scan_args(argc, argv, "10", &str);
-        rb_warn("Gdk::Property.string_to_compound_text: Not supported arguments in GTK+-2.0.x.");
-        num = gdk_string_to_compound_text(RVAL2CSTR(str),
-                                          &encoding, &format,
-                                          &ctext, &length);
-#endif
     }
 
     if (num == 0){
@@ -190,7 +159,6 @@ rg_m_utf8_to_compound_text(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
                                         &encoding, &format,
                                         &ctext, &length);
     } else {
-#if GTK_CHECK_VERSION(2,2,0)
         VALUE display, str;
 
         rb_scan_args(argc, argv, "20", &display, &str);
@@ -198,15 +166,6 @@ rg_m_utf8_to_compound_text(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
                                                     RVAL2CSTR(str),
                                                     &encoding, &format,
                                                     &ctext, &length);
-#else
-        VALUE str;
-        rb_scan_args(argc, argv, "10", &str);
-
-        rb_warn("Gdk::Property.utf8_to_compound_text: Not supported arguments in GTK+-2.0.x.");
-        ret = gdk_utf8_to_compound_text(RVAL2CSTR(str),
-                                        &encoding, &format,
-                                        &ctext, &length);
-#endif
     }
 
     if (ret){

data/ext/gtk2/rbgdkscreen.c

@@ -25,8 +25,6 @@
 #include <rb_cairo.h>
 #endif
 
-#if GTK_CHECK_VERSION(2,2,0)
-
 #define RG_TARGET_NAMESPACE cScreen
 #define _SELF(i) GDK_SCREEN(RVAL2GOBJ(i))
 
@@ -76,7 +74,6 @@ rg_rgb_visual(VALUE self)
     return GOBJ2RVAL(gdk_screen_get_rgb_visual(_SELF(self)));
 }
 
-#if GTK_CHECK_VERSION(2,8,0)
 static VALUE
 rg_rgba_colormap(VALUE self)
 {
@@ -88,15 +85,12 @@ rg_rgba_visual(VALUE self)
 {
     return GOBJ2RVAL(gdk_screen_get_rgba_visual(_SELF(self)));
 }
-#endif
 
-#if GTK_CHECK_VERSION(2,10,0)
 static VALUE
 rg_composited_p(VALUE self)
 {
     return CBOOL2RVAL(gdk_screen_is_composited(_SELF(self)));
 }
-#endif
 
 static VALUE
 rg_root_window(VALUE self)
@@ -222,7 +216,6 @@ rg_get_setting(int argc, VALUE *argv, VALUE self)
     return value;
 }
 
-#if GTK_CHECK_VERSION(2,10,0)
 #ifdef HAVE_RB_CAIRO_H
 static VALUE
 gdkscreen_get_font_options(VALUE self)
@@ -258,9 +251,7 @@ rg_window_stack(VALUE self)
     g_list_free(list);
     return ary;
 }
-#endif
 
-#if GTK_CHECK_VERSION(2,4,0)
 static void
 child_setup(gpointer func)
 {
@@ -346,7 +337,6 @@ rg_spawn_command_line_on_screen(G_GNUC_UNUSED VALUE self, VALUE command_line)
 
     return ret;   
 }
-#endif
 
 /* From X Window System Interaction */
 #ifdef GDK_WINDOWING_X11
@@ -375,12 +365,9 @@ rg_screen_number(VALUE self)
 }
 #endif
 
-#endif
-
 void 
 Init_gtk_gdk_screen(VALUE mGdk)
 {
-#if GTK_CHECK_VERSION(2,2,0)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GDK_TYPE_SCREEN, "Screen", mGdk);
 
     id_new = rb_intern("new");
@@ -393,13 +380,9 @@ Init_gtk_gdk_screen(VALUE mGdk)
     RG_DEF_METHOD(system_visual, 0);
     RG_DEF_METHOD(rgb_colormap, 0);
     RG_DEF_METHOD(rgb_visual, 0);
-#if GTK_CHECK_VERSION(2,8,0)
     RG_DEF_METHOD(rgba_colormap, 0);
     RG_DEF_METHOD(rgba_visual, 0);
-#endif
-#if GTK_CHECK_VERSION(2,10,0)
     RG_DEF_METHOD_P(composited, 0);
-#endif
     RG_DEF_METHOD(root_window, 0);
     RG_DEF_METHOD(display, 0);
     RG_DEF_METHOD(number, 0);
@@ -415,20 +398,16 @@ Init_gtk_gdk_screen(VALUE mGdk)
     RG_DEF_METHOD(get_monitor, -1);
     RG_DEF_METHOD(broadcast_client_message, 1);
     RG_DEF_METHOD(get_setting, -1);
-#if GTK_CHECK_VERSION(2,10,0)
 #ifdef HAVE_RB_CAIRO_H
     G_REPLACE_GET_PROPERTY(RG_TARGET_NAMESPACE, "font_options", gdkscreen_get_font_options, 0);
     G_REPLACE_SET_PROPERTY(RG_TARGET_NAMESPACE, "font_options", gdkscreen_set_font_options, 1);
 #endif
     RG_DEF_METHOD(active_window, 0);
     RG_DEF_METHOD(window_stack, 0);
-#endif
 
-#if GTK_CHECK_VERSION(2,4,0)
     RG_DEF_METHOD(spawn_on_screen, 4);
     RG_DEF_METHOD(spawn_on_screen_with_pipes, 4);
     RG_DEF_METHOD(spawn_command_line_on_screen, 1);
-#endif
 
 #ifdef GDK_WINDOWING_X11
     RG_DEF_METHOD(xnumber, 0);
@@ -440,5 +419,4 @@ Init_gtk_gdk_screen(VALUE mGdk)
 #ifdef GDK_WINDOWING_X11
     G_DEF_CLASS3("GdkScreenX11", "ScreenX11", mGdk);
 #endif
-#endif
 }

data/ext/gtk2/rbgdkselection.c

@@ -36,17 +36,12 @@ rg_m_owner_set(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
                                       RVAL2ATOM(selection), 
                                       NUM2UINT(time), RVAL2CBOOL(send_event));
     } else {
-#if GTK_CHECK_VERSION(2,2,0)
       VALUE display = Qnil;
       rb_scan_args(argc, argv, "50", &display, &owner, &selection, &time, &send_event);
       ret = gdk_selection_owner_set_for_display(GDK_DISPLAY_OBJECT(RVAL2GOBJ(display)),
                                                 GDK_WINDOW(RVAL2GOBJ(owner)), 
                                                 RVAL2ATOM(selection), 
                                                 NUM2UINT(time), RVAL2CBOOL(send_event));
-#else
-      rb_raise(rb_eArgError, "Wrong number of arguments: %d", argc);
-#endif
-
     }
     return CBOOL2RVAL(ret);
 }
@@ -60,14 +55,10 @@ rg_m_owner_get(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
         rb_scan_args(argc, argv, "10", &selection);
         return GOBJ2RVAL(gdk_selection_owner_get(RVAL2ATOM(selection)));
     } else {
-#if GTK_CHECK_VERSION(2,2,0)
       VALUE display = Qnil;
       rb_scan_args(argc, argv, "20", &display, &selection);
       return GOBJ2RVAL(gdk_selection_owner_get_for_display(GDK_DISPLAY_OBJECT(RVAL2GOBJ(display)),
                                                            RVAL2ATOM(selection)));
-#else
-      rb_raise(rb_eArgError, "Wrong number of arguments: %d", argc);
-#endif
     }
 }
 
@@ -109,7 +100,6 @@ rg_m_send_notify(int argc, VALUE *argv, VALUE self)
                                   NIL_P(property) ? GDK_NONE : RVAL2ATOM(property), 
                                   NUM2INT(time));
     } else {
-#if GTK_CHECK_VERSION(2,2,0)
       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)),
@@ -117,9 +107,6 @@ rg_m_send_notify(int argc, VALUE *argv, VALUE self)
                                             RVAL2ATOM(target), 
                                             NIL_P(property) ? GDK_NONE : RVAL2ATOM(property), 
                                             NUM2INT(time));
-#else
-      rb_raise(rb_eArgError, "Wrong number of arguments: %d", argc);
-#endif
     }
     return self;
 }

data/ext/gtk2/rbgdkvisual.c

@@ -117,13 +117,11 @@ rg_s_best_with_both(G_GNUC_UNUSED VALUE self, VALUE depth, VALUE type)
                                     (GdkVisualType)RVAL2GENUM(type, GDK_TYPE_VISUAL_TYPE)));
 }
 
-#if GTK_CHECK_VERSION(2,2,0)
 static VALUE
 rg_screen(VALUE self)
 {
     return GOBJ2RVAL(gdk_visual_get_screen(_SELF(self)));
 }
-#endif
 
 /* Structure accessors */
 static VALUE
@@ -228,9 +226,7 @@ Init_gtk_gdk_visual(VALUE mGdk)
     RG_DEF_SMETHOD(best_with_both, 2);
 
     /* instance methods */
-#if GTK_CHECK_VERSION(2,2,0)
     RG_DEF_METHOD(screen, 0);
-#endif
     RG_DEF_METHOD(visual_type, 0);
     RG_DEF_METHOD(depth, 0);
     RG_DEF_METHOD(byte_order, 0);

data/ext/gtk2/rbgdkwindow.c

@@ -149,7 +149,6 @@ rg_unmaximize(VALUE self)
     gdk_window_unmaximize(_SELF(self));
     return self;
 }
-#if GTK_CHECK_VERSION(2,2,0)
 static VALUE
 rg_fullscreen(VALUE self)
 {
@@ -163,8 +162,6 @@ rg_unfullscreen(VALUE self)
     gdk_window_unfullscreen(_SELF(self));
     return self;
 }
-#endif
-#if GTK_CHECK_VERSION(2,4,0)
 static VALUE
 rg_set_keep_above(VALUE self, VALUE setting)
 {
@@ -178,7 +175,6 @@ rg_set_keep_below(VALUE self, VALUE setting)
     gdk_window_set_keep_below(_SELF(self), RVAL2CBOOL(setting));
     return self;
 }
-#endif
 
 static VALUE
 rg_move(VALUE self, VALUE x, VALUE y)
@@ -208,7 +204,6 @@ rg_scroll(VALUE self, VALUE dx, VALUE dy)
     return self;
 }
 
-#if GTK_CHECK_VERSION(2,8,0)
 static VALUE
 rg_move_region(VALUE self, VALUE region, VALUE dx, VALUE dy)
 {
@@ -218,7 +213,6 @@ rg_move_region(VALUE self, VALUE region, VALUE dx, VALUE dy)
                            NUM2INT(dy));
     return self;
 }
-#endif
 
 static VALUE
 rg_reparent(VALUE self, VALUE new_parent, VALUE x, VALUE y)
@@ -430,7 +424,6 @@ rg_internal_paint_info(VALUE self)
                        INT2NUM(x_offset), INT2NUM(y_offset));
 }
 
-#if GTK_CHECK_VERSION(2,6,0)
 static VALUE
 rg_configure_finished(VALUE self)
 {
@@ -448,7 +441,6 @@ rg_enable_synchronized_configure(VALUE self)
     }
     return self;
 }
-#endif
 
 static VALUE
 rg_set_user_data(VALUE self, VALUE user_data)
@@ -465,23 +457,19 @@ rg_set_override_redirect(VALUE self, VALUE override_redirect)
     return self;
 }
 
-#if GTK_CHECK_VERSION(2,4,0)
 static VALUE
 rg_set_accept_focus(VALUE self, VALUE accept_focus)
 {
     gdk_window_set_accept_focus(_SELF(self), RVAL2CBOOL(accept_focus));
     return self;
 }
-#endif
 
-#if GTK_CHECK_VERSION(2,6,0)
 static VALUE
 rg_set_focus_on_map(VALUE self, VALUE focus_on_map)
 {
     gdk_window_set_focus_on_map(_SELF(self), RVAL2CBOOL(focus_on_map));
     return self;
 }
-#endif
 
 /* GdkXEvent is not implemented.
   void        gdk_window_add_filter           (GdkWindow *window,
@@ -527,7 +515,6 @@ rg_merge_child_shapes(VALUE self)
     return self;
 }   
 
-#if GTK_CHECK_VERSION(2,10,0)
 static VALUE
 rg_input_shape_combine_mask(VALUE self, VALUE mask, VALUE x, VALUE y)
 {
@@ -561,8 +548,6 @@ rg_merge_child_input_shapes(VALUE self)
     return self;
 }
 
-#endif
-
 static VALUE
 rg_set_static_gravities(VALUE self, VALUE use_static)
 {
@@ -597,7 +582,6 @@ rg_set_back_pixmap(VALUE self, VALUE pixmap, VALUE parent_relative)
     return self;
 }
 
-#if GTK_CHECK_VERSION(2,10,0)
 static VALUE
 rg_set_cursor(VALUE self, VALUE cursor)
 {
@@ -605,7 +589,6 @@ rg_set_cursor(VALUE self, VALUE cursor)
                           RVAL2BOXED(cursor, GDK_TYPE_CURSOR));
     return self;
 }
-#endif
 
 static VALUE
 rg_user_data(VALUE self)
@@ -660,15 +643,12 @@ rg_set_type_hint(VALUE self, VALUE hint)
     return self;
 }
 
-#if GTK_CHECK_VERSION(2,10,0)
 static VALUE
 rg_type_hint(VALUE self)
 {
     return GENUM2RVAL(gdk_window_get_type_hint(_SELF(self)), GDK_TYPE_WINDOW_TYPE_HINT);
 }
-#endif
 
-#if GTK_CHECK_VERSION(2,2,0)
 static VALUE
 rg_set_skip_taskbar_hint(VALUE self, VALUE hint)
 {
@@ -682,16 +662,13 @@ rg_set_skip_pager_hint(VALUE self, VALUE hint)
     gdk_window_set_skip_pager_hint(_SELF(self), RVAL2CBOOL(hint));
     return self;
 }
-#endif
 
-#if GTK_CHECK_VERSION(2,8,0)
 static VALUE
 rg_set_urgency_hint(VALUE self, VALUE hint)
 {
     gdk_window_set_urgency_hint(_SELF(self), RVAL2CBOOL(hint));
     return self;
 }
-#endif
 
 static VALUE
 rg_position(VALUE self)
@@ -809,13 +786,11 @@ rg_set_group(VALUE self, VALUE leader)
     return self;
 }
 
-#if GTK_CHECK_VERSION(2,4,0)
 static VALUE
 rg_group(VALUE self)
 {
     return GOBJ2RVAL(gdk_window_get_group(_SELF(self)));
 }
-#endif
 
 static VALUE
 rg_set_decorations(VALUE self, VALUE decor)
@@ -893,13 +868,8 @@ rg_s_foreign_new(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
         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]),
-                                                 RVAL2GDKNATIVEWINDOW(arg[1])); 
-#else
-        win = gdk_window_foreign_new(NUM2UINT(arg[1])); 
-        rb_warn("Not supported in GTK+-2.0.x.");
-#endif 
+                                                 RVAL2GDKNATIVEWINDOW(arg[1]));
         break;
     default:
         break;
@@ -925,12 +895,7 @@ rg_s_lookup(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
         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]), RVAL2GDKNATIVEWINDOW(arg[1])); 
-#else
-        win = gdk_window_lookup(NUM2UINT(arg[1])); 
-        rb_warn("Not supported in GTK+-2.0.x.");
-#endif
+        win = gdk_window_lookup_for_display(RVAL2GOBJ(arg[0]), RVAL2GDKNATIVEWINDOW(arg[1]));
         break;
     default:
         break;
@@ -949,16 +914,13 @@ rg_server_time(VALUE self)
     return UINT2NUM(gdk_x11_get_server_time(_SELF(self)));
 }
 
-#if GTK_CHECK_VERSION(2,6,0)
 static VALUE
 rg_set_user_time(VALUE self, VALUE time)
 {
     gdk_x11_window_set_user_time(_SELF(self), NUM2UINT(time));
     return Qnil;
 }
-#endif
 
-#if GTK_CHECK_VERSION(2,8,0)
 static VALUE
 rg_move_to_current_desktop(VALUE self)
 {
@@ -967,8 +929,6 @@ rg_move_to_current_desktop(VALUE self)
 }
 #endif
 
-#endif
-
 void
 Init_gtk_gdk_window(VALUE mGdk)
 {
@@ -997,21 +957,15 @@ Init_gtk_gdk_window(VALUE mGdk)
     RG_DEF_METHOD(unstick, 0);
     RG_DEF_METHOD(maximize, 0);
     RG_DEF_METHOD(unmaximize, 0);
-#if GTK_CHECK_VERSION(2,2,0)
     RG_DEF_METHOD(fullscreen, 0);
     RG_DEF_METHOD(unfullscreen, 0);
-#endif
-#if GTK_CHECK_VERSION(2,4,0)
     RG_DEF_METHOD(set_keep_above, 1);
     RG_DEF_METHOD(set_keep_below, 1);
-#endif
     RG_DEF_METHOD(move, 2);
     RG_DEF_METHOD(resize, 2);
     RG_DEF_METHOD(move_resize, 4);
     RG_DEF_METHOD(scroll, 2);
-#if GTK_CHECK_VERSION(2,8,0)
     RG_DEF_METHOD(move_region, 3);
-#endif
     RG_DEF_METHOD(reparent, 3);
     RG_DEF_METHOD(clear, 0);
     RG_DEF_METHOD(clear_area, -1);
@@ -1033,52 +987,35 @@ Init_gtk_gdk_window(VALUE mGdk)
     RG_DEF_METHOD(thaw_updates, 0);
     RG_DEF_METHOD(process_updates, 1);
     RG_DEF_METHOD(internal_paint_info, 0);
-#if GTK_CHECK_VERSION(2,6,0)
     RG_DEF_METHOD(configure_finished, 0);
     RG_DEF_METHOD(enable_synchronized_configure, 0);
-#endif
     RG_DEF_METHOD(set_user_data, 1);
     RG_DEF_METHOD(set_override_redirect, 1);
-#if GTK_CHECK_VERSION(2,4,0)
     RG_DEF_METHOD(set_accept_focus, 1);
-#endif
-#if GTK_CHECK_VERSION(2,6,0)
     RG_DEF_METHOD(set_focus_on_map, 1);
-#endif
     RG_DEF_METHOD(shape_combine_mask, 3);
     RG_DEF_METHOD(shape_combine_region, 3);
     RG_DEF_METHOD(set_child_shapes, 0);
     RG_DEF_METHOD(merge_child_shapes, 0);
-#if GTK_CHECK_VERSION(2,10,0)
     RG_DEF_METHOD(input_shape_combine_mask, 3);
     RG_DEF_METHOD(input_shape_combine_region, 3);
     RG_DEF_METHOD(set_child_input_shapes, 0);
     RG_DEF_METHOD(merge_child_input_shapes, 0);
-#endif
     RG_DEF_METHOD(set_static_gravities, 1);
     RG_DEF_METHOD(set_title, 1);
     RG_DEF_METHOD(set_background, 1);
     RG_DEF_METHOD(set_back_pixmap, 2);
-#if GTK_CHECK_VERSION(2,10,0)
     RG_DEF_METHOD(set_cursor, 1);
-#endif
     RG_DEF_METHOD(user_data, 0);
     RG_DEF_METHOD(geometry, 0);
     RG_DEF_METHOD(set_geometry_hints, 2);
     RG_DEF_METHOD(set_icon_list, 1);
     RG_DEF_METHOD(set_modal_hint, 1);
     RG_DEF_METHOD(set_type_hint, 1);
-#if GTK_CHECK_VERSION(2,10,0)
     RG_DEF_METHOD(type_hint, 0);
-#endif
-
-#if GTK_CHECK_VERSION(2,2,0)
     RG_DEF_METHOD(set_skip_taskbar_hint, 1);
     RG_DEF_METHOD(set_skip_pager_hint, 1);
-#endif
-#if GTK_CHECK_VERSION(2,8,0)
     RG_DEF_METHOD(set_urgency_hint, 1);
-#endif
     RG_DEF_METHOD(position, 0);
     RG_DEF_METHOD(root_origin, 0);
     RG_DEF_METHOD(frame_extents, 0);
@@ -1095,9 +1032,7 @@ Init_gtk_gdk_window(VALUE mGdk)
     RG_DEF_METHOD(set_transient_for, 1);
     RG_DEF_METHOD(set_role, 1);
     RG_DEF_METHOD(set_group, 1);
-#if GTK_CHECK_VERSION(2,4,0)
     RG_DEF_METHOD(group, 0);
-#endif
     RG_DEF_METHOD(set_decorations, 1);
     RG_DEF_METHOD(decorations, 0);
     RG_DEF_METHOD(set_functions, 1);
@@ -1162,12 +1097,8 @@ Init_gtk_gdk_window(VALUE mGdk)
 #ifdef GDK_WINDOWING_X11
     RG_DEF_METHOD(server_time, 0);
 
-#if GTK_CHECK_VERSION(2,6,0)
     RG_DEF_METHOD(set_user_time, 1);
-#endif
-#if GTK_CHECK_VERSION(2,8,0)
     RG_DEF_METHOD(move_to_current_desktop, 0);
-#endif
 
     G_DEF_CLASS3("GdkWindowImplX11", "WindowImplX11", mGdk);
 #elif defined(GDK_WINDOWING_WIN32)