gtk2 2.0.2 → 2.0.3

data/ext/gtk2/rbgtkiconsize.c

@@ -34,7 +34,6 @@ rg_m_lookup(G_GNUC_UNUSED VALUE self, VALUE size)
         return Qnil;
 }
 
-#if GTK_CHECK_VERSION(2,2,0)
 static VALUE
 rg_m_lookup_for_settings(G_GNUC_UNUSED VALUE self, VALUE settings, VALUE size)
 {
@@ -47,7 +46,6 @@ rg_m_lookup_for_settings(G_GNUC_UNUSED VALUE self, VALUE settings, VALUE size)
     else
         return Qnil;
 }
-#endif
 
 static VALUE
 rg_m_register(G_GNUC_UNUSED VALUE self, VALUE name, VALUE width, VALUE height)
@@ -83,9 +81,7 @@ Init_gtk_icon_size(VALUE mGtk)
     VALUE RG_TARGET_NAMESPACE = rb_define_module_under(mGtk, "IconSize");
 
     RG_DEF_MODFUNC(lookup, 1);
-#if GTK_CHECK_VERSION(2,2,0)
     RG_DEF_MODFUNC(lookup_for_settings, 2);
-#endif
     RG_DEF_MODFUNC(register, 3);
     RG_DEF_MODFUNC(register_alias, 2);
     RG_DEF_MODFUNC(from_name, 1);

data/ext/gtk2/rbgtkicontheme.c

@@ -21,8 +21,6 @@
 
 #include "global.h"
 
-#if GTK_CHECK_VERSION(2,4,0)
-
 #define RG_TARGET_NAMESPACE cIconTheme
 #define _SELF(i) GTK_ICON_THEME(RVAL2GOBJ(i))
 
@@ -149,7 +147,6 @@ rg_icons(int argc, VALUE *argv, VALUE self)
     return GLIST2ARY_STR_FREE(icons);
 }
 
-#if GTK_CHECK_VERSION(2,6,0)
 static VALUE
 rg_get_icon_sizes(VALUE self, VALUE icon_name)
 {
@@ -164,7 +161,6 @@ rg_get_icon_sizes(VALUE self, VALUE icon_name)
     g_free(sizes);
     return ary;
 }
-#endif
 
 static VALUE
 rg_example_icon_name(VALUE self)
@@ -236,12 +232,9 @@ rg_contexts(VALUE self)
 }
 #endif
 
-#endif
-
 void
 Init_gtk_icon_theme(VALUE mGtk)
 {
-#if GTK_CHECK_VERSION(2,4,0)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_ICON_THEME, "IconTheme", mGtk);
 
     RG_DEF_METHOD(initialize, 0);
@@ -257,9 +250,7 @@ Init_gtk_icon_theme(VALUE mGtk)
     RG_DEF_METHOD(lookup_icon, 3);
     RG_DEF_METHOD(load_icon, 3);
     RG_DEF_METHOD(icons, -1);
-#if GTK_CHECK_VERSION(2,6,0)
     RG_DEF_METHOD(get_icon_sizes, 1);
-#endif
     RG_DEF_METHOD(example_icon_name, 0);
     RG_DEF_METHOD(rescan_if_needed, 0);
 
@@ -279,6 +270,4 @@ Init_gtk_icon_theme(VALUE mGtk)
     /* GtkIconLookupFlags */
     G_DEF_CLASS(GTK_TYPE_ICON_LOOKUP_FLAGS, "LookupFlags", RG_TARGET_NAMESPACE);
     G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GTK_TYPE_ICON_LOOKUP_FLAGS, "GTK_ICON_");
-
-#endif
 }

data/ext/gtk2/rbgtkiconview.c

@@ -21,8 +21,6 @@
 
 #include "global.h"
 
-#if GTK_CHECK_VERSION(2,6,0)
-
 #define RG_TARGET_NAMESPACE cIconView
 #define _SELF(s) (GTK_ICON_VIEW(RVAL2GOBJ(s)))
 
@@ -105,9 +103,7 @@ rg_item_activated(VALUE self, VALUE path)
     gtk_icon_view_item_activated(_SELF(self), RVAL2GTKTREEPATH(path));
     return self;
 }
-#endif
 
-#if GTK_CHECK_VERSION(2,8,0)
 static VALUE
 rg_create_drag_icon(VALUE self, VALUE path)
 {
@@ -236,12 +232,10 @@ rg_unset_model_drag_source(VALUE self)
     gtk_icon_view_unset_model_drag_source(_SELF(self));
     return self;
 }
-#endif
 
 void
 Init_gtk_iconview(VALUE mGtk)
 {
-#if GTK_CHECK_VERSION(2,6,0)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_ICON_VIEW, "IconView", mGtk);
 
     id_model = rb_intern("model");
@@ -256,8 +250,6 @@ Init_gtk_iconview(VALUE mGtk)
     RG_DEF_METHOD_P(path_is_selected, 1);
     RG_DEF_METHOD(selected_items, 0);
     RG_DEF_METHOD(item_activated, 1);
-#endif
-#if GTK_CHECK_VERSION(2,8,0)
     RG_DEF_METHOD(create_drag_icon, 1);
     RG_DEF_METHOD(enable_model_drag_dest, 2);
     RG_DEF_METHOD(enable_model_drag_source, 3);
@@ -275,5 +267,4 @@ Init_gtk_iconview(VALUE mGtk)
     /* GtkIconViewDropPosition */
     G_DEF_CLASS(GTK_TYPE_ICON_VIEW_DROP_POSITION, "Type", RG_TARGET_NAMESPACE);
     G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GTK_TYPE_ICON_VIEW_DROP_POSITION, "GTK_ICON_VIEW_");
-#endif
 }

data/ext/gtk2/rbgtkimage.c

@@ -40,11 +40,9 @@ rg_initialize(int argc, VALUE *argv, VALUE self)
     } else if (TYPE(arg1) == T_SYMBOL){
         widget = gtk_image_new_from_stock(rb_id2name(SYM2ID(arg1)), 
                                           RVAL2GENUM(arg2, GTK_TYPE_ICON_SIZE));
-#if GTK_CHECK_VERSION(2,6,0)
     } else if (TYPE(arg1) == T_STRING){
         widget = gtk_image_new_from_icon_name(RVAL2CSTR(arg1),
                                               RVAL2GENUM(arg2, GTK_TYPE_ICON_SIZE));
-#endif
     } else {
         gtype = RVAL2GTYPE(arg1);
         if (gtype == GDK_TYPE_IMAGE){
@@ -78,11 +76,9 @@ rg_set(int argc, VALUE *argv, VALUE self)
     } else if (TYPE(arg1) == T_SYMBOL){
         gtk_image_set_from_stock(_SELF(self), rb_id2name(SYM2ID(arg1)), 
                                  RVAL2GENUM(arg2, GTK_TYPE_ICON_SIZE));
-#if GTK_CHECK_VERSION(2,6,0)
     } else if (TYPE(arg1) == T_STRING){
         gtk_image_set_from_icon_name(_SELF(self), RVAL2CSTR(arg1),
                                      RVAL2GENUM(arg2, GTK_TYPE_ICON_SIZE));
-#endif
     } else {
         gtype = RVAL2GTYPE(arg1);
         if (gtype == GDK_TYPE_IMAGE){
@@ -108,14 +104,12 @@ rg_set(int argc, VALUE *argv, VALUE self)
     return self;
 }
 
-#if GTK_CHECK_VERSION(2,8,0)
 static VALUE
 rg_clear(VALUE self)
 {
     gtk_image_clear(_SELF(self));
     return self;
 }
-#endif
 
 void 
 Init_gtk_image(VALUE mGtk)
@@ -123,9 +117,7 @@ Init_gtk_image(VALUE mGtk)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_IMAGE, "Image", mGtk);
     RG_DEF_METHOD(initialize, -1);
     RG_DEF_METHOD(set, -1);
-#if GTK_CHECK_VERSION(2,8,0)
     RG_DEF_METHOD(clear, 0);
-#endif
 
     /* GtkImageType */
     G_DEF_CLASS(GTK_TYPE_IMAGE_TYPE, "Type", RG_TARGET_NAMESPACE);

data/ext/gtk2/rbgtkinvisible.c

@@ -34,12 +34,8 @@ rg_initialize(int argc, VALUE *argv, VALUE self)
     if (argc == 0){
         RBGTK_INITIALIZE(self, gtk_invisible_new());
     } else {
-#if GTK_CHECK_VERSION(2,2,0)
         RBGTK_INITIALIZE(self, gtk_invisible_new_for_screen(
                              GDK_SCREEN(RVAL2GOBJ(screen))));
-#else
-        rb_raise(rb_eArgError, "GTK+-2.2 feature. GTK+-2.0.x doesn't support this.");
-#endif
     }
     return Qnil;
 }

data/ext/gtk2/rbgtklinkbutton.c

@@ -21,8 +21,6 @@
 
 #include "global.h"
 
-#if GTK_CHECK_VERSION(2,10,0)
-
 #define RG_TARGET_NAMESPACE cLinkButton
 #define _SELF(self) (GTK_LINK_BUTTON(RVAL2GOBJ(self)))
 
@@ -56,15 +54,12 @@ rg_s_set_uri_hook(VALUE self)
     gtk_link_button_set_uri_hook((GtkLinkButtonUriFunc)link_func, (gpointer)func, (GDestroyNotify)NULL);
     return self;
 }
-#endif 
 
 void 
 Init_gtk_link_button(VALUE mGtk)
 {
-#if GTK_CHECK_VERSION(2,10,0)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_LINK_BUTTON, "LinkButton", mGtk);
 
     RG_DEF_METHOD(initialize, -1);
     RG_DEF_SMETHOD(set_uri_hook, 0);
-#endif
 }

data/ext/gtk2/rbgtkliststore.c

@@ -192,12 +192,7 @@ static VALUE
 rg_remove(VALUE self, VALUE iter)
 {
     G_CHILD_REMOVE(self, iter);
-#if GTK_CHECK_VERSION(2,2,0)
     return CBOOL2RVAL(gtk_list_store_remove(_SELF(self), RVAL2GTKTREEITER(iter)));
-#else
-    gtk_list_store_remove(_SELF(self), RVAL2GTKTREEITER(iter));
-    return Qtrue;
-#endif
 }
 
 struct lstore_insert_args {
@@ -267,7 +262,6 @@ rg_insert(int argc, VALUE *argv, VALUE self)
     if (NIL_P(values)){
         gtk_list_store_insert(args.store, &args.iter, args.position);
     } else {
-#if GTK_CHECK_VERSION(2,6,0)
         args.ary = rb_funcall(values, id_to_a, 0);
         args.n = RARRAY_LEN(args.ary);
         args.columns = g_new(gint, args.n);
@@ -275,10 +269,6 @@ rg_insert(int argc, VALUE *argv, VALUE self)
 
         rb_ensure(lstore_insert_body, (VALUE)&args,
                   lstore_insert_ensure, (VALUE)&args);
-#else
-        gtk_list_store_insert(args.store, &args.iter, args.position);
-        rb_warn("Ignored 2nd argument under this environment, as it has been supported since GTK+-2.6.");
-#endif
     }
 
     args.iter.user_data3 = args.store;
@@ -348,7 +338,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)
 {
@@ -389,7 +378,6 @@ rg_move_after(VALUE self, VALUE iter, VALUE position)
                                NIL_P(position) ? NULL : RVAL2GTKTREEITER(position));
     return self;
 }
-#endif
 
 void
 Init_gtk_list_store(VALUE mGtk)
@@ -411,13 +399,11 @@ Init_gtk_list_store(VALUE mGtk)
     RG_DEF_METHOD(prepend, 0);
     RG_DEF_METHOD(append, 0);
     RG_DEF_METHOD(clear, 0);
-#if GTK_CHECK_VERSION(2,2,0)
     RG_DEF_METHOD_P(iter_is_valid, 1);
     RG_DEF_METHOD(reorder, 1);
     RG_DEF_METHOD(swap, 2);
     RG_DEF_METHOD(move_before, 2);
     RG_DEF_METHOD(move_after, 2);
-#endif
 #if GTK_CHECK_VERSION(2, 12, 0)
     RG_DEF_METHOD(set_values, 2);
 #endif

data/ext/gtk2/rbgtkmenu.c

@@ -35,14 +35,12 @@ rg_initialize(VALUE self)
     return Qnil;
 }
 
-#if GTK_CHECK_VERSION(2,2,0)
 static VALUE
 rg_set_screen(VALUE self, VALUE screen)
 {
     gtk_menu_set_screen(_SELF(self), GDK_SCREEN(RVAL2GOBJ(screen)));
     return self;
 }
-#endif
 
 static VALUE
 rg_reorder_child(VALUE self, VALUE child, VALUE position)
@@ -52,7 +50,6 @@ rg_reorder_child(VALUE self, VALUE child, VALUE position)
     return self;
 }
 
-#if GTK_CHECK_VERSION(2,4,0)
 static VALUE
 rg_attach(VALUE self, VALUE child, VALUE left_attach, VALUE right_attach, VALUE top_attach, VALUE bottom_attach)
 {
@@ -61,7 +58,6 @@ rg_attach(VALUE self, VALUE child, VALUE left_attach, VALUE right_attach, VALUE
                     NUM2UINT(top_attach), NUM2UINT(bottom_attach));
     return self;
 }
-#endif
 
 static void
 menu_pos_func(GtkMenu *menu, gint *px, gint *py, gboolean *push_in, gpointer data)
@@ -149,14 +145,12 @@ rg_detach(VALUE self)
     return self;
 }
 
-#if GTK_CHECK_VERSION(2,6,0)
 static VALUE
 rg_s_get_for_attach_widget(G_GNUC_UNUSED VALUE self, VALUE widget)
 {
     /* Owned by GTK+ */
     return GLIST2ARY(gtk_menu_get_for_attach_widget(GTK_WIDGET(RVAL2GOBJ(widget))));
 }
-#endif
 
 void 
 Init_gtk_menu(VALUE mGtk)
@@ -164,20 +158,14 @@ Init_gtk_menu(VALUE mGtk)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_MENU, "Menu", mGtk);
 
     RG_DEF_METHOD(initialize, 0);
-#if GTK_CHECK_VERSION(2,2,0)
     RG_DEF_METHOD(set_screen, 1);
     G_DEF_SETTER(RG_TARGET_NAMESPACE, "screen");
-#endif
     RG_DEF_METHOD(reorder_child, 2);
-#if GTK_CHECK_VERSION(2,4,0)
     RG_DEF_METHOD(attach, 5);
-#endif
     RG_DEF_METHOD(popup, 4);
     RG_DEF_METHOD(popdown, 0);
     RG_DEF_METHOD(reposition, 0);
     RG_DEF_METHOD(detach, 0);
-#if GTK_CHECK_VERSION(2,6,0)
     RG_DEF_SMETHOD(get_for_attach_widget, 1);
-#endif
     RG_DEF_METHOD(attach_to_widget, 1);
 }

data/ext/gtk2/rbgtkmenubar.c

@@ -39,9 +39,7 @@ Init_gtk_menu_bar(VALUE mGtk)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_MENU_BAR, "MenuBar", mGtk);
     RG_DEF_METHOD(initialize, 0);
 
-#if GTK_CHECK_VERSION(2,8,0)
     /* GtkPackDirection */
     G_DEF_CLASS(GTK_TYPE_PACK_DIRECTION, "PackDirection", RG_TARGET_NAMESPACE);
     G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GTK_TYPE_PACK_DIRECTION, "GTK_");
-#endif
 }

data/ext/gtk2/rbgtkmenushell.c

@@ -67,14 +67,12 @@ rg_select_item(VALUE self, VALUE menu_item)
     return self;
 }
 
-#if GTK_CHECK_VERSION(2,2,0)
 static VALUE
 rg_select_first(VALUE self, VALUE search_sensitive)
 {
     gtk_menu_shell_select_first(_SELF(self), RVAL2CBOOL(search_sensitive));
     return self;
 }
-#endif
 
 static VALUE
 rg_deselect(VALUE self)
@@ -101,9 +99,7 @@ Init_gtk_menu_shell(VALUE mGtk)
     RG_DEF_METHOD(insert, 2);
     RG_DEF_METHOD(deactivate, 0);
     RG_DEF_METHOD(select_item, 1);
-#if GTK_CHECK_VERSION(2,2,0)
     RG_DEF_METHOD(select_first, 1);
-#endif
     RG_DEF_METHOD(deselect, 0);
     RG_DEF_METHOD(activate_item, 2);
     /* GtkMenuDirectionType */

data/ext/gtk2/rbgtkmenutoolbutton.c

@@ -21,8 +21,6 @@
 
 #include "global.h"
 
-#if GTK_CHECK_VERSION(2,6,0)
-
 #define RG_TARGET_NAMESPACE cMenuToolButton
 #define _SELF(self) (GTK_MENU_TOOL_BUTTON(RVAL2GOBJ(self)))
 
@@ -65,15 +63,12 @@ rg_set_arrow_tooltip(int argc, VALUE *argv, VALUE self)
                                            NIL_P(tip_private) ? NULL : RVAL2CSTR(tip_private));
     return self;
 }
-#endif
 
 void 
 Init_gtk_menutoolbutton(VALUE mGtk)
 {
-#if GTK_CHECK_VERSION(2,6,0)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_MENU_TOOL_BUTTON, "MenuToolButton", mGtk);
 
     RG_DEF_METHOD(initialize, -1);
     RG_DEF_METHOD(set_arrow_tooltip, -1);
-#endif
 }

data/ext/gtk2/rbgtkmessagedialog.c

@@ -52,14 +52,12 @@ GtkWidget*  gtk_message_dialog_new_with_markup
                                              const gchar *message_format,
                                              ...);
 */
-#if GTK_CHECK_VERSION(2,4,0)
 static VALUE
 rg_set_markup(VALUE self, VALUE str)
 {
     gtk_message_dialog_set_markup(_SELF(self), RVAL2CSTR(str));
     return self;
 }
-#endif
 
 /* Not needed in Ruby
 void                gtk_message_dialog_format_secondary_text
@@ -78,10 +76,8 @@ Init_gtk_message_dialog(VALUE mGtk)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_MESSAGE_DIALOG, "MessageDialog", mGtk);
 
     RG_DEF_METHOD(initialize, -1);
-#if GTK_CHECK_VERSION(2,4,0)
     RG_DEF_METHOD(set_markup, 1);
     G_DEF_SETTER(RG_TARGET_NAMESPACE, "markup");
-#endif
 
     /* GtkMessageType */
     G_DEF_CLASS(GTK_TYPE_MESSAGE_TYPE, "Type", RG_TARGET_NAMESPACE);

data/ext/gtk2/rbgtknotebook.c

@@ -168,13 +168,11 @@ rg_get_nth_page(VALUE self, VALUE page_num)
     return page ? GOBJ2RVAL(page) : Qnil;
 }
 
-#if GTK_CHECK_VERSION(2,2,0)
 static VALUE
 rg_n_pages(VALUE self)
 {
     return INT2NUM(gtk_notebook_get_n_pages(_SELF(self)));
 }
-#endif
 
 static VALUE
 rg_get_tab_label(VALUE self, VALUE child)
@@ -260,7 +258,6 @@ rg_get_tab_label_text(VALUE self, VALUE child)
                                                      RVAL2WIDGET(child)));
 }
 
-#if GTK_CHECK_VERSION(2,10,0)
 static VALUE
 rg_get_tab_reorderable(VALUE self, VALUE child)
 {
@@ -307,7 +304,6 @@ rg_s_set_window_creation_hook(VALUE self)
                                           (gpointer)func, (GDestroyNotify)NULL);
     return self;
 }    
-#endif
 
 #if GTK_CHECK_VERSION(2,20,0)
 static VALUE
@@ -389,9 +385,7 @@ Init_gtk_notebook(VALUE mGtk)
     RG_DEF_METHOD(reorder_child, 2);
     RG_DEF_METHOD(get_menu_label, 1);
     RG_DEF_METHOD(get_nth_page, 1);
-#if GTK_CHECK_VERSION(2,2,0)
     RG_DEF_METHOD(n_pages, 0);
-#endif
     RG_DEF_METHOD(get_tab_label, 1);
     RG_DEF_METHOD(query_tab_label_packing, 1);
     RG_DEF_METHOD(set_menu_label, 2);
@@ -401,14 +395,11 @@ Init_gtk_notebook(VALUE mGtk)
     RG_DEF_METHOD(set_tab_label_text, 2);
     RG_DEF_METHOD(get_menu_label_text, 1);
     RG_DEF_METHOD(get_tab_label_text, 1);
-
-#if GTK_CHECK_VERSION(2,10,0)
     RG_DEF_METHOD(get_tab_reorderable, 1);
     RG_DEF_METHOD(set_tab_reorderable, 2);
     RG_DEF_METHOD(get_tab_detachable, 1);
     RG_DEF_METHOD(set_tab_detachable, 2);
     RG_DEF_SMETHOD(set_window_creation_hook, 0);
-#endif
 #if GTK_CHECK_VERSION(2,20,0)
     RG_DEF_METHOD(set_action_widget, 2);
     RG_DEF_METHOD(get_action_widget, 1);