gtk2 2.0.2 → 2.0.3

data/ext/gtk2/rbgtkcellrendereraccel.c

@@ -21,8 +21,6 @@
 
 #include "global.h"
 
-#if GTK_CHECK_VERSION(2,10,0)
-
 #define RG_TARGET_NAMESPACE cCellRendererAccel
 #define _SELF(s) (GTK_CELL_RENDERER_ACCEL(RVAL2GOBJ(s)))
 
@@ -33,17 +31,13 @@ rg_initialize(VALUE self)
     return Qnil;
 }
 
-#endif
-
 void
 Init_gtk_cellrendereraccel(VALUE mGtk)
 {
-#if GTK_CHECK_VERSION(2,10,0)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_CELL_RENDERER_ACCEL, "CellRendererAccel", mGtk);
     RG_DEF_METHOD(initialize, 0);
 
     /* GtkCellRendererAccelMode */
     G_DEF_CLASS(GTK_TYPE_CELL_RENDERER_ACCEL_MODE, "Mode", RG_TARGET_NAMESPACE);
     G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GTK_TYPE_CELL_RENDERER_ACCEL_MODE, "GTK_CELL_RENDERER_ACCEL_");
-#endif
 }

data/ext/gtk2/rbgtkcellrenderercombo.c

@@ -21,8 +21,6 @@
 
 #include "global.h"
 
-#if GTK_CHECK_VERSION(2,6,0)
-
 #define RG_TARGET_NAMESPACE cCellRendererCombo
 
 static VALUE
@@ -32,13 +30,9 @@ rg_initialize(VALUE self)
     return Qnil;
 }
 
-#endif
-
 void
 Init_gtk_cellrenderercombo(VALUE mGtk)
 {
-#if GTK_CHECK_VERSION(2,6,0)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_CELL_RENDERER_COMBO, "CellRendererCombo", mGtk);
     RG_DEF_METHOD(initialize, 0);
-#endif
 }

data/ext/gtk2/rbgtkcellrendererprogress.c

@@ -21,8 +21,6 @@
 
 #include "global.h"
 
-#if GTK_CHECK_VERSION(2,6,0)
-
 #define RG_TARGET_NAMESPACE cCellRendererProgress
 
 static VALUE
@@ -32,13 +30,9 @@ rg_initialize(VALUE self)
     return Qnil;
 }
 
-#endif
-
 void
 Init_gtk_cellrendererprogress(VALUE mGtk)
 {
-#if GTK_CHECK_VERSION(2,6,0)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_CELL_RENDERER_PROGRESS, "CellRendererProgress", mGtk);
     RG_DEF_METHOD(initialize, 0);
-#endif
 }

data/ext/gtk2/rbgtkcellrendererspin.c

@@ -21,8 +21,6 @@
 
 #include "global.h"
 
-#if GTK_CHECK_VERSION(2,10,0)
-
 #define RG_TARGET_NAMESPACE cCellRendererSpin
 #define _SELF(s) (GTK_CELL_RENDERER_SPIN(RVAL2GOBJ(s)))
 
@@ -33,13 +31,9 @@ rg_initialize(VALUE self)
     return Qnil;
 }
 
-#endif
-
 void
 Init_gtk_cellrendererspin(VALUE mGtk)
 {
-#if GTK_CHECK_VERSION(2,10,0)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_CELL_RENDERER_SPIN, "CellRendererSpin", mGtk);
     RG_DEF_METHOD(initialize, 0);
-#endif
 }

data/ext/gtk2/rbgtkcellview.c

@@ -21,8 +21,6 @@
 
 #include "global.h"
 
-#if GTK_CHECK_VERSION(2,6,0)
-
 #define RG_TARGET_NAMESPACE cCellView
 #define _SELF(self) (GTK_CELL_VIEW(RVAL2GOBJ(self)))
 
@@ -101,12 +99,10 @@ rg_cell_renderers(VALUE self)
 {
     return GLIST2ARYF(gtk_cell_view_get_cell_renderers(_SELF(self)));
 }
-#endif
 
 void
 Init_gtk_cellview(VALUE mGtk)
 {
-#if GTK_CHECK_VERSION(2,6,0)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_CELL_VIEW, "CellView", mGtk);
 
     id_model = rb_intern("model");
@@ -118,5 +114,4 @@ Init_gtk_cellview(VALUE mGtk)
     RG_DEF_METHOD(displayed_row, 0);
     RG_DEF_METHOD(get_size_of_row, 1);
     RG_DEF_METHOD(cell_renderers, 0);
-#endif
 }

data/ext/gtk2/rbgtkclipboard.c

@@ -67,14 +67,10 @@ rg_s_get(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
         rb_scan_args(argc, argv, "10", &selection);
         clipboard = gtk_clipboard_get(RVAL2ATOM(selection));
     } else {
-#if GTK_CHECK_VERSION(2,2,0)
         VALUE display, selection;
         rb_scan_args(argc, argv, "20", &display, &selection);
         clipboard = gtk_clipboard_get_for_display(GDK_DISPLAY_OBJECT(RVAL2GOBJ(display)),
                                                   RVAL2ATOM(selection));
-#else
-        rb_raise(rb_eArgError, "Wrong number of arguments: %d", argc);
-#endif
     } 
     return CLIPBOARD2RVAL(clipboard);
 }
@@ -82,11 +78,7 @@ rg_s_get(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
 static VALUE
 rg_display(VALUE self)
 {
-#if GTK_CHECK_VERSION(2,2,0)
     return GOBJ2RVAL(gtk_clipboard_get_display(_SELF(self)));
-#else
-    return Qnil;
-#endif
 }
 
 static void
@@ -175,14 +167,12 @@ rg_set_text(VALUE self, VALUE text)
     return self;
 }
 
-#if GTK_CHECK_VERSION(2,6,0)
 static VALUE
 rg_set_image(VALUE self, VALUE pixbuf)
 {
     gtk_clipboard_set_image(_SELF(self), GDK_PIXBUF(RVAL2GOBJ(pixbuf)));
     return self;
 }
-#endif
 
 static void
 clipboard_received_func(GtkClipboard *clipboard, GtkSelectionData *selection_data, gpointer func)
@@ -225,7 +215,6 @@ rg_request_text(VALUE self)
     return self;
 }
 
-#if GTK_CHECK_VERSION(2,6,0)
 static void
 clipboard_image_received_func(GtkClipboard *clipboard, GdkPixbuf *pixbuf, gpointer func)
 {
@@ -243,9 +232,7 @@ rg_request_image(VALUE self)
                                (gpointer)func);
     return self;
 }
-#endif
 
-#if GTK_CHECK_VERSION(2,4,0)
 static void
 clipboard_target_received_func(GtkClipboard *clipboard, GdkAtom *atoms, gint n_atoms, gpointer func)
 {
@@ -269,9 +256,7 @@ rg_request_targets(VALUE self)
                                   (gpointer)func);
     return self;
 }
-#endif
 
-#if GTK_CHECK_VERSION(2,10,0)
 static void
 clipboard_rich_text_received_func(GtkClipboard *clipboard, GdkAtom format, const guint8 *text, gsize length, gpointer func)
 {
@@ -290,7 +275,6 @@ rg_request_rich_text(VALUE self, VALUE buffer)
                                     (gpointer)func);
     return self;
 }
-#endif
 
 static VALUE
 rg_wait_for_contents(VALUE self, VALUE target)
@@ -309,16 +293,13 @@ rg_wait_for_text(VALUE self)
     return str ? CSTR2RVAL(str) : Qnil;
 }
 
-#if GTK_CHECK_VERSION(2,6,0)
 static VALUE
 rg_wait_for_image(VALUE self)
 {
     GdkPixbuf* pixbuf = gtk_clipboard_wait_for_image(_SELF(self));
     return GOBJ2RVAL(pixbuf);
 }
-#endif
 
-#if GTK_CHECK_VERSION(2,10,0)
 static VALUE
 rg_wait_for_rich_text(VALUE self, VALUE buffer)
 {
@@ -336,7 +317,6 @@ rg_wait_for_rich_text(VALUE self, VALUE buffer)
     }
 
 }
-#endif
 
 static VALUE
 rg_wait_is_text_available_p(VALUE self)
@@ -344,23 +324,18 @@ rg_wait_is_text_available_p(VALUE self)
     return CBOOL2RVAL(gtk_clipboard_wait_is_text_available(_SELF(self)));
 }
 
-#if GTK_CHECK_VERSION(2,6,0)
 static VALUE
 rg_wait_is_image_available_p(VALUE self)
 {
     return CBOOL2RVAL(gtk_clipboard_wait_is_image_available(_SELF(self)));
 }
-#endif
 
-#if GTK_CHECK_VERSION(2,10,0)
 static VALUE
 rg_wait_is_rich_text_available_p(VALUE self, VALUE buffer)
 {
     return CBOOL2RVAL(gtk_clipboard_wait_is_rich_text_available(_SELF(self), GTK_TEXT_BUFFER(RVAL2GOBJ(buffer))));
 }
-#endif
 
-#if GTK_CHECK_VERSION(2,4,0)
 static VALUE
 rg_wait_for_targets(VALUE self)
 {
@@ -386,9 +361,7 @@ rg_wait_for_targets(VALUE self)
     }
     return ary;
 }
-#endif
 
-#if GTK_CHECK_VERSION(2,6,0)
 static VALUE
 rg_wait_is_target_available_p(VALUE self, VALUE target)
 {
@@ -416,7 +389,6 @@ rg_store(VALUE self)
 
     return self;
 }
-#endif
 
 void 
 Init_gtk_clipboard(VALUE mGtk)
@@ -431,43 +403,23 @@ Init_gtk_clipboard(VALUE mGtk)
 */
     RG_DEF_METHOD(clear, 0);
     RG_DEF_METHOD(set_text, 1);
-#if GTK_CHECK_VERSION(2,6,0)
     RG_DEF_METHOD(set_image, 1);
-#endif
     RG_DEF_METHOD(request_contents, 1);
     RG_DEF_METHOD(request_text, 0);
-#if GTK_CHECK_VERSION(2,6,0)
     RG_DEF_METHOD(request_image, 0);
-#endif
-#if GTK_CHECK_VERSION(2,4,0)
     RG_DEF_METHOD(request_targets, 0);
-#endif
-#if GTK_CHECK_VERSION(2,10,0)
     RG_DEF_METHOD(request_rich_text, 1);
-#endif
     RG_DEF_METHOD(wait_for_contents, 1);
     RG_DEF_METHOD(wait_for_text, 0);
-#if GTK_CHECK_VERSION(2,6,0)
     RG_DEF_METHOD(wait_for_image, 0);
-#endif
-#if GTK_CHECK_VERSION(2,10,0)
     RG_DEF_METHOD(wait_for_rich_text, 1);
-#endif
     RG_DEF_METHOD_P(wait_is_text_available, 0);
-#if GTK_CHECK_VERSION(2,6,0)
     RG_DEF_METHOD_P(wait_is_image_available, 0);
-#endif
-#if GTK_CHECK_VERSION(2,10,0)
     RG_DEF_METHOD_P(wait_is_rich_text_available, 1);
-#endif
-#if GTK_CHECK_VERSION(2,4,0)
     RG_DEF_METHOD(wait_for_targets, 0);
-#endif
-#if GTK_CHECK_VERSION(2,6,0)
     RG_DEF_METHOD_P(wait_is_target_available, 1);
     RG_DEF_METHOD(set_can_store, 1);
     RG_DEF_METHOD(store, 0);
-#endif
 
     G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 }

data/ext/gtk2/rbgtkcolorbutton.c

@@ -21,8 +21,6 @@
 
 #include "global.h"
 
-#if GTK_CHECK_VERSION(2,4,0)
-
 #define RG_TARGET_NAMESPACE cColorButton
 
 static VALUE
@@ -43,13 +41,9 @@ rg_initialize(int argc, VALUE *argv, VALUE self)
     return Qnil;
 }
 
-#endif
-
 void 
 Init_gtk_colorbutton(VALUE mGtk)
 {
-#if GTK_CHECK_VERSION(2,4,0)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_COLOR_BUTTON, "ColorButton", mGtk);
     RG_DEF_METHOD(initialize, -1);
-#endif
 }

data/ext/gtk2/rbgtkcolorsel.c

@@ -157,7 +157,6 @@ rg_s_palette_to_string(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
     return CSTR2RVAL_FREE(palette);
 }
 
-#if GTK_CHECK_VERSION(2,2,0)
 static void
 screen_func(GdkScreen *screen, const GdkColor *colors, gint n_colors)
 {
@@ -181,7 +180,6 @@ rg_s_set_change_palette_hook(VALUE self)
         (GtkColorSelectionChangePaletteWithScreenFunc)screen_func);
     return self;
 }
-#endif
 
 /* Don't implement them.
 GtkColorSelectionChangePaletteFunc gtk_color_selection_set_change_palette_hook
@@ -207,9 +205,7 @@ Init_gtk_color_selection(VALUE mGtk)
     RG_DEF_SMETHOD(palette_to_string, -1);
     RG_DEF_SMETHOD(palette_from_string, 1);
 
-#if GTK_CHECK_VERSION(2,2,0)
     RG_DEF_SMETHOD(set_change_palette_hook, 0);
-#endif
 
     G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 }

data/ext/gtk2/rbgtkcombobox.c

@@ -21,8 +21,6 @@
 
 #include "global.h"
 
-#if GTK_CHECK_VERSION(2,4,0)
-
 #define RG_TARGET_NAMESPACE cComboBox
 #define _SELF(self) (GTK_COMBO_BOX(RVAL2GOBJ(self)))
 #define RVAL2WIDGET(w) (GTK_WIDGET(RVAL2GOBJ(w)))
@@ -98,8 +96,6 @@ rg_remove_text(VALUE self, VALUE position)
     return self;
 }
 
-#if GTK_CHECK_VERSION(2,6,0)
-
 static VALUE
 rg_active_text(VALUE self)
 {
@@ -136,13 +132,9 @@ rg_set_row_separator_func(VALUE self)
     return self;
 }
 
-#endif
-#endif
-
 void 
 Init_gtk_combobox(VALUE mGtk)
 {
-#if GTK_CHECK_VERSION(2,4,0)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_COMBO_BOX, "ComboBox", mGtk);
 
     RG_DEF_METHOD(initialize, -1);
@@ -153,11 +145,7 @@ Init_gtk_combobox(VALUE mGtk)
     RG_DEF_METHOD(insert_text, 2);
     RG_DEF_METHOD(prepend_text, 1);
     RG_DEF_METHOD(remove_text, 1);
-
-#if GTK_CHECK_VERSION(2,6,0)
     RG_DEF_METHOD(active_text, 0);
     RG_DEF_METHOD(popup_accessible, 0);
     RG_DEF_METHOD(set_row_separator_func, 0);
-#endif
-#endif
 }

data/ext/gtk2/rbgtkcomboboxentry.c

@@ -21,8 +21,6 @@
 
 #include "global.h"
 
-#if GTK_CHECK_VERSION(2,4,0)
-
 #define RG_TARGET_NAMESPACE cComboBoxEntry
 
 static VALUE
@@ -50,13 +48,9 @@ rg_initialize(int argc, VALUE *argv, VALUE self)
     return Qnil;
 }
 
-#endif
-
 void 
 Init_gtk_comboboxentry(VALUE mGtk)
 {
-#if GTK_CHECK_VERSION(2,4,0)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_COMBO_BOX_ENTRY, "ComboBoxEntry", mGtk);
     RG_DEF_METHOD(initialize, -1);
-#endif
 }

data/ext/gtk2/rbgtkconst.c

@@ -138,10 +138,8 @@ Init_gtk_const(VALUE mGtk)
     G_DEF_CONSTANTS(mGtk, GTK_TYPE_RESPONSE_TYPE, "GTK_");
 
     /* GtkScrollStep */
-#if GTK_CHECK_VERSION(2,4,0)
     G_DEF_CLASS(GTK_TYPE_SCROLL_STEP, "ScrollStep", mGtk);
     G_DEF_CONSTANTS(mGtk, GTK_TYPE_SCROLL_STEP, "GTK_");
-#endif
 
     /* GtkScrollType */
     G_DEF_CLASS(GTK_TYPE_SCROLL_TYPE, "ScrollType", mGtk);

data/ext/gtk2/rbgtkdialog.c

@@ -167,7 +167,6 @@ rg_set_response_sensitive(VALUE self, VALUE response_id, VALUE setting)
     return self;
 }
 
-#if GTK_CHECK_VERSION(2,6,0)
 static VALUE
 rg_s_alternative_dialog_button_order_p(G_GNUC_UNUSED VALUE self, VALUE screen)
 {
@@ -197,8 +196,6 @@ rg_set_alternative_button_order(VALUE self, VALUE rbnew_order)
     return self;
 }
 
-#endif
-
 static VALUE
 rg_vbox(VALUE self)
 {
@@ -211,13 +208,11 @@ rg_action_area(VALUE self)
     return GOBJ2RVAL(_SELF(self)->action_area);
 }
 
-#if GTK_CHECK_VERSION(2,8,0)
 static VALUE
 rg_get_response(VALUE self, VALUE widget)
 {
     return INT2NUM(gtk_dialog_get_response_for_widget(_SELF(self), RVAL2GOBJ(widget)));
 }
-#endif
 
 void 
 Init_gtk_dialog(VALUE mGtk)
@@ -235,19 +230,14 @@ Init_gtk_dialog(VALUE mGtk)
     RG_DEF_METHOD(set_default_response, 1);
     G_DEF_SETTER(RG_TARGET_NAMESPACE, "default_response");
 
-#if GTK_CHECK_VERSION(2,6,0)
     RG_DEF_SMETHOD_P(alternative_dialog_button_order, 1);
     RG_DEF_METHOD(set_alternative_button_order, 1);
-#endif
-
     RG_DEF_METHOD(set_response_sensitive, 2);
     RG_DEF_METHOD(vbox, 0);
     RG_DEF_METHOD(action_area, 0);
 
-#if GTK_CHECK_VERSION(2,8,0)
     RG_DEF_METHOD(get_response, 1);
     RG_DEF_ALIAS("get_response_for_widget", "get_response");
-#endif
 
     /* GtkDialogFlags */
     G_DEF_CLASS(GTK_TYPE_DIALOG_FLAGS, "Flags", RG_TARGET_NAMESPACE);