gtk2 2.0.2 → 2.0.3

data/ext/gtk2/rbgtkdrag.c

@@ -159,7 +159,6 @@ rg_m_dest_set_target_list(VALUE self, VALUE widget, VALUE target_list)
     return self;
 }
 
-#if GTK_CHECK_VERSION(2,6,0)
 static VALUE
 rg_m_dest_add_text_targets(VALUE self, VALUE widget)
 {
@@ -178,9 +177,7 @@ rg_m_dest_add_uri_targets(VALUE self, VALUE widget)
     gtk_drag_dest_add_uri_targets(RVAL2WIDGET(widget));
     return self;
 }
-#endif
 
-#if GTK_CHECK_VERSION(2,10,0)
 static VALUE
 rg_m_dest_set_track_motion(VALUE self, VALUE widget, VALUE track_motion)
 {
@@ -193,7 +190,6 @@ rg_m_dest_get_track_motion(G_GNUC_UNUSED VALUE self, VALUE widget)
 {
     return CBOOL2RVAL(gtk_drag_dest_get_track_motion(RVAL2WIDGET(widget)));
 }
-#endif
 
 static VALUE
 rg_m_finish(VALUE self, VALUE context, VALUE success, VALUE del, VALUE time)
@@ -273,14 +269,12 @@ rg_m_set_icon(int argc, VALUE *argv, VALUE self)
     return self;
 }
 
-#if GTK_CHECK_VERSION(2,8,0)
 static VALUE
 rg_m_set_icon_name(VALUE self, VALUE context, VALUE name, VALUE hot_x, VALUE hot_y)
 {
     gtk_drag_set_icon_name(RVAL2DC(context), RVAL2CSTR(name), NUM2INT(hot_x), NUM2INT(hot_y));
     return self;
 }
-#endif
 
 static VALUE
 rg_m_set_icon_default(VALUE self, VALUE context)
@@ -335,14 +329,12 @@ rg_m_source_set_icon(int argc, VALUE *argv, VALUE self)
     return self;
 }
 
-#if GTK_CHECK_VERSION(2,8,0)
 static VALUE
 rg_m_source_set_icon_name(VALUE self, VALUE widget, VALUE icon_name)
 {
     gtk_drag_source_set_icon_name(RVAL2WIDGET(widget), RVAL2CSTR(icon_name));
     return self;
 }
-#endif
 
 static VALUE
 rg_m_source_unset(VALUE self, VALUE widget)
@@ -351,7 +343,6 @@ rg_m_source_unset(VALUE self, VALUE widget)
     return self;
 }
 
-#if GTK_CHECK_VERSION(2,4,0)
 static VALUE
 rg_m_source_set_target_list(VALUE self, VALUE widget, VALUE targetlist)
 {
@@ -369,9 +360,7 @@ rg_m_source_get_target_list(G_GNUC_UNUSED VALUE self, VALUE widget)
     GtkTargetList* ret = gtk_drag_source_get_target_list(RVAL2WIDGET(widget));
     return NIL_P(ret) ? Qnil : BOXED2RVAL(ret, GTK_TYPE_TARGET_LIST);
 }
-#endif
 
-#if GTK_CHECK_VERSION(2,6,0)
 static VALUE
 rg_m_source_add_text_targets(VALUE self, VALUE widget)
 {
@@ -390,7 +379,6 @@ rg_m_source_add_uri_targets(VALUE self, VALUE widget)
     gtk_drag_source_add_uri_targets(RVAL2WIDGET(widget));
     return self;
 }
-#endif
 
 void
 Init_gtk_drag(VALUE mGtk)
@@ -403,15 +391,11 @@ Init_gtk_drag(VALUE mGtk)
     RG_DEF_MODFUNC(dest_find_target, -1);
     RG_DEF_MODFUNC(dest_get_target_list, 1);
     RG_DEF_MODFUNC(dest_set_target_list, 2);
-#if GTK_CHECK_VERSION(2,6,0)
     RG_DEF_MODFUNC(dest_add_text_targets, 1);
     RG_DEF_MODFUNC(dest_add_image_targets, 1);
     RG_DEF_MODFUNC(dest_add_uri_targets, 1);
-#endif
-#if GTK_CHECK_VERSION(2,10,0)
     RG_DEF_MODFUNC(dest_set_track_motion, 2);
     RG_DEF_MODFUNC(dest_get_track_motion, 1);
-#endif
     RG_DEF_MODFUNC(finish, 4);
     RG_DEF_MODFUNC(get_data, 4);
     RG_DEF_MODFUNC(get_source_widget, 1);
@@ -420,25 +404,17 @@ Init_gtk_drag(VALUE mGtk)
     RG_DEF_MODFUNC(begin, 5);
     RG_DEF_MODFUNC_P(threshold, 5);
     RG_DEF_MODFUNC(set_icon, -1);
-#if GTK_CHECK_VERSION(2,8,0)
     RG_DEF_MODFUNC(set_icon_name, 4);
-#endif
     RG_DEF_MODFUNC(set_icon_default, 1);
     RG_DEF_MODFUNC(source_set, 4);
     RG_DEF_MODFUNC(source_set_icon, -1);
-#if GTK_CHECK_VERSION(2,8,0)
     RG_DEF_MODFUNC(source_set_icon_name, 2);
-#endif
     RG_DEF_MODFUNC(source_unset, 1);
-#if GTK_CHECK_VERSION(2,4,0)
     RG_DEF_MODFUNC(source_set_target_list, 2);
     RG_DEF_MODFUNC(source_get_target_list, 1);
-#endif
-#if GTK_CHECK_VERSION(2,6,0)
     RG_DEF_MODFUNC(source_add_text_targets, 1);
     RG_DEF_MODFUNC(source_add_image_targets, 1);
     RG_DEF_MODFUNC(source_add_uri_targets, 1);
-#endif
     G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 
     /* GtkDestDefaults */

data/ext/gtk2/rbgtkentry.c

@@ -48,7 +48,6 @@ rg_layout_offsets(VALUE self)
     return rb_ary_new3(2, INT2NUM(x), INT2NUM(y));
 }
 
-#if GTK_CHECK_VERSION(2,4,0)
 static VALUE
 rg_set_completion(VALUE self, VALUE completion)
 {
@@ -64,7 +63,6 @@ rg_completion(VALUE self)
 {
     return GOBJ2RVAL(gtk_entry_get_completion(_SELF(self)));
 }
-#endif
 
 static VALUE
 rg_layout_index_to_text_index(VALUE self, VALUE layout_index)
@@ -101,11 +99,9 @@ Init_gtk_entry(VALUE mGtk)
     RG_DEF_METHOD(initialize, 0);
     RG_DEF_METHOD(layout, 0);
     RG_DEF_METHOD(layout_offsets, 0);
-#if GTK_CHECK_VERSION(2,4,0)
     RG_DEF_METHOD(set_completion, 1);
     G_DEF_SETTER(RG_TARGET_NAMESPACE, "completion");
     RG_DEF_METHOD(completion, 0);
-#endif
     RG_DEF_METHOD(layout_index_to_text_index, 1);
     RG_DEF_METHOD(text_index_to_layout_index, 1);
 

data/ext/gtk2/rbgtkentrycompletion.c

@@ -21,8 +21,6 @@
 
 #include "global.h"
 
-#if GTK_CHECK_VERSION(2,4,0)
-
 #define RG_TARGET_NAMESPACE cEntryCompletion
 #define _SELF(self) (GTK_ENTRY_COMPLETION(RVAL2GOBJ(self)))
 
@@ -65,14 +63,12 @@ rg_complete(VALUE self)
     return self;
 }
 
-#if GTK_CHECK_VERSION(2,6,0)
 static VALUE
 rg_insert_prefix(VALUE self)
 {
     gtk_entry_completion_insert_prefix(_SELF(self));
     return self;
 }
-#endif
 
 static VALUE
 rg_insert_action_text(VALUE self, VALUE index, VALUE text)
@@ -110,21 +106,16 @@ rg_completion_prefix(VALUE self)
 }
 #endif
 
-#endif
-
 void 
 Init_gtk_entry_completion(VALUE mGtk)
 {
-#if GTK_CHECK_VERSION(2,4,0)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_ENTRY_COMPLETION, "EntryCompletion", mGtk);
 
     RG_DEF_METHOD(initialize, 0);
     RG_DEF_METHOD(entry, 0);
     RG_DEF_METHOD(set_match_func, 0);
     RG_DEF_METHOD(complete, 0);
-#if GTK_CHECK_VERSION(2,6,0)
     RG_DEF_METHOD(insert_prefix, 0);
-#endif
     RG_DEF_METHOD(insert_action_text, 2);
     RG_DEF_METHOD(insert_action_markup, 2);
     RG_DEF_METHOD(delete_action, 1);
@@ -134,5 +125,4 @@ Init_gtk_entry_completion(VALUE mGtk)
 #if GTK_CHECK_VERSION(2, 12, 0)
     RG_DEF_METHOD(completion_prefix, 0);
 #endif
-#endif
 }

data/ext/gtk2/rbgtkexpander.c

@@ -21,8 +21,6 @@
 
 #include "global.h"
 
-#if GTK_CHECK_VERSION(2,4,0)
-
 #define RG_TARGET_NAMESPACE cExpander
 #define _SELF(self) (GTK_EXPANDER(RVAL2GOBJ(self)))
 
@@ -43,13 +41,9 @@ rg_initialize(int argc, VALUE *argv, VALUE self)
     return Qnil;
 }
 
-#endif
-
 void 
 Init_gtk_expander(VALUE mGtk)
 {
-#if GTK_CHECK_VERSION(2,4,0)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_EXPANDER, "Expander", mGtk);
     RG_DEF_METHOD(initialize, -1);
-#endif
 }

data/ext/gtk2/rbgtkfilechooser.c

@@ -22,8 +22,6 @@
 
 #include "global.h"
 
-#if GTK_CHECK_VERSION(2,4,0)
-
 #define RG_TARGET_NAMESPACE mFileChooser
 #define _SELF(self) GTK_FILE_CHOOSER(RVAL2GOBJ(self))
 
@@ -259,14 +257,10 @@ rg_shortcut_folder_uris(VALUE self)
 {
     return gslist2ary_free(gtk_file_chooser_list_shortcut_folder_uris(_SELF(self)));
 }
-#endif
 
 void 
 Init_gtk_file_chooser(VALUE mGtk)
 {
-
-#if GTK_CHECK_VERSION(2,4,0)
-
     VALUE RG_TARGET_NAMESPACE = G_DEF_INTERFACE(GTK_TYPE_FILE_CHOOSER, "FileChooser", mGtk);
 
     RG_DEF_METHOD(set_current_name, 1);
@@ -309,13 +303,9 @@ Init_gtk_file_chooser(VALUE mGtk)
     G_DEF_ERROR(GTK_FILE_CHOOSER_ERROR, "FileChooserError", mGtk, rb_eRuntimeError, 
                 GTK_TYPE_FILE_CHOOSER_ERROR);
 
-#if GTK_CHECK_VERSION(2,8,0)
     /* GtkFileChooserConfirmation */
     G_DEF_CLASS(GTK_TYPE_FILE_CHOOSER_CONFIRMATION, "Confirmation", RG_TARGET_NAMESPACE);
     G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GTK_TYPE_FILE_CHOOSER_CONFIRMATION, "GTK_FILE_CHOOSER_");
-#endif
 
     G_DEF_CLASS3("GtkFileChooserEmbed", "FileChooserEmbed", mGtk);
-
-#endif
 }

data/ext/gtk2/rbgtkfilechooserbutton.c

@@ -21,8 +21,6 @@
 
 #include "global.h"
 
-#if GTK_CHECK_VERSION(2,6,0)
-
 #define RG_TARGET_NAMESPACE cFileChooserButton
 
 static VALUE
@@ -51,13 +49,9 @@ rg_initialize(int argc, VALUE *argv, VALUE self)
     return Qnil;
 }
 
-#endif
-
 void 
 Init_gtk_filechooserbutton(VALUE mGtk)
 {
-#if GTK_CHECK_VERSION(2,6,0)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_FILE_CHOOSER_BUTTON, "FileChooserButton", mGtk);
     RG_DEF_METHOD(initialize, -1);
-#endif
 }

data/ext/gtk2/rbgtkfilechooserdialog.c

@@ -21,8 +21,6 @@
 
 #include "global.h"
 
-#if GTK_CHECK_VERSION(2,4,0)
-
 #define RG_TARGET_NAMESPACE cFileChooserDialog
 #define _SELF(self) GTK_FILE_CHOOSER_DIALOG(RVAL2GOBJ(self))
 
@@ -52,16 +50,10 @@ rg_initialize(int argc, VALUE *argv, VALUE self)
     return Qnil;
 }
 
-#endif
-
 void 
 Init_gtk_file_chooser_dialog(VALUE mGtk)
 {
-#if GTK_CHECK_VERSION(2,4,0)
-
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_FILE_CHOOSER_DIALOG, "FileChooserDialog", mGtk);
 
     RG_DEF_METHOD(initialize, -1);
-
-#endif
 }

data/ext/gtk2/rbgtkfilechooserwidget.c

@@ -21,8 +21,6 @@
 
 #include "global.h"
 
-#if GTK_CHECK_VERSION(2,4,0)
-
 #define RG_TARGET_NAMESPACE cFileChooserWidget
 
 static VALUE
@@ -43,16 +41,12 @@ rg_initialize(int argc, VALUE *argv, VALUE self)
     RBGTK_INITIALIZE(self, widget);
     return Qnil;
 }
-#endif
 
 void 
 Init_gtk_file_chooser_widget(VALUE mGtk)
 {
-#if GTK_CHECK_VERSION(2,4,0)
 
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_FILE_CHOOSER_WIDGET, "FileChooserWidget", mGtk);
 
     RG_DEF_METHOD(initialize, -1);
-
-#endif
 }

data/ext/gtk2/rbgtkfilefilter.c

@@ -22,8 +22,6 @@
 
 #include "global.h"
 
-#if GTK_CHECK_VERSION(2,4,0)
-
 #define RG_TARGET_NAMESPACE cFileFilter
 #define _SELF(self) GTK_FILE_FILTER(RVAL2GOBJ(self))
 
@@ -75,14 +73,12 @@ filter_func(const GtkFileFilterInfo *info, gpointer func)
                                  CSTR2RVAL(info->mime_type)));
 }
 
-#if GTK_CHECK_VERSION(2,6,0)
 static VALUE
 rg_add_pixbuf_formats(VALUE self)
 {
     gtk_file_filter_add_pixbuf_formats(_SELF(self));
     return self;
 }
-#endif
 
 static VALUE
 rg_add_custom(VALUE self, VALUE needed)
@@ -112,13 +108,10 @@ rg_filter_p(VALUE self, VALUE contains, VALUE filename, VALUE uri, VALUE display
 
     return CBOOL2RVAL(gtk_file_filter_filter(_SELF(self), &info));
 }
-#endif
 
 void 
 Init_gtk_file_filter(VALUE mGtk)
 {
-#if GTK_CHECK_VERSION(2,4,0)
-
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_FILE_FILTER, "FileFilter", mGtk);
 
     RG_DEF_METHOD(initialize, 0);
@@ -126,9 +119,7 @@ Init_gtk_file_filter(VALUE mGtk)
     RG_DEF_METHOD(name, 0);
     RG_DEF_METHOD(add_mime_type, 1);
     RG_DEF_METHOD(add_pattern, 1);
-#if GTK_CHECK_VERSION(2,6,0)
     RG_DEF_METHOD(add_pixbuf_formats, 0);
-#endif
     RG_DEF_METHOD(add_custom, 1);
     RG_DEF_METHOD(needed, 0);
     RG_DEF_METHOD_P(filter, 5);
@@ -137,6 +128,4 @@ Init_gtk_file_filter(VALUE mGtk)
 
     G_DEF_CLASS(GTK_TYPE_FILE_FILTER_FLAGS, "Flags", RG_TARGET_NAMESPACE);
     G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GTK_TYPE_FILE_FILTER_FLAGS, "GTK_FILE_FILTER_");
-
-#endif
 }

data/ext/gtk2/rbgtkfilesystemerror.c

@@ -27,7 +27,6 @@
 void 
 Init_gtk_filesystemerror(VALUE mGtk)
 {
-#if GTK_CHECK_VERSION(2,4,0)
 #ifdef GTK_FILE_SYSTEM_ERROR
     VALUE RG_TARGET_NAMESPACE;
 
@@ -47,5 +46,4 @@ Init_gtk_filesystemerror(VALUE mGtk)
     rb_define_const(RG_TARGET_NAMESPACE, "ALREADY_EXSITS",
                     INT2NUM(GTK_FILE_SYSTEM_ERROR_ALREADY_EXISTS));
 #endif
-#endif
 }

data/ext/gtk2/rbgtkfontbutton.c

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

data/ext/gtk2/rbgtkiconinfo.c

@@ -21,8 +21,6 @@
 
 #include "global.h"
 
-#if GTK_CHECK_VERSION(2,4,0)
-
 #define RG_TARGET_NAMESPACE cIconInfo
 #define _SELF(i) ((GtkIconInfo*)RVAL2BOXED(i, GTK_TYPE_ICON_INFO))
 
@@ -100,12 +98,10 @@ rg_display_name(VALUE self)
 {
     return CSTR2RVAL(gtk_icon_info_get_display_name(_SELF(self)));
 }
-#endif
 
 void 
 Init_gtk_iconinfo(VALUE mGtk)
 {
-#if GTK_CHECK_VERSION(2,4,0)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_ICON_INFO, "IconInfo", mGtk);
 
     RG_DEF_METHOD(base_size, 0);
@@ -118,5 +114,4 @@ Init_gtk_iconinfo(VALUE mGtk)
     RG_DEF_METHOD(display_name, 0);
 
     G_DEF_SETTERS(RG_TARGET_NAMESPACE);
-#endif
 }