gtk2 2.0.2 → 2.0.3

data/ext/gtk2/rbgtkstyle.c

@@ -87,7 +87,6 @@ rg_apply_default_background(VALUE self, VALUE gdkwindow, VALUE set_bg, VALUE sta
     return self;
 }
 
-#if GTK_CHECK_VERSION(2,10,0)
 static VALUE
 rg_lookup_color(VALUE self, VALUE color_name)
 {
@@ -98,7 +97,6 @@ rg_lookup_color(VALUE self, VALUE color_name)
         return Qnil;
     }
 }
-#endif
 
 static VALUE
 rg_lookup_icon_set(VALUE self, VALUE stock_id)
@@ -355,7 +353,6 @@ rg_paint_resize_grip(VALUE self, VALUE gdkwindow, VALUE state_type, VALUE area,
                           NUM2INT(width), NUM2INT(height));
     return self;
 }
-#if GTK_CHECK_VERSION(2,4,0)
 static VALUE
 rg_s_draw_insertion_cursor(VALUE self, VALUE widget, VALUE drawable, VALUE area, VALUE location, VALUE is_primary, VALUE direction, VALUE draw_arrow)
 {
@@ -367,7 +364,6 @@ rg_s_draw_insertion_cursor(VALUE self, VALUE widget, VALUE drawable, VALUE area,
                               RVAL2CBOOL(draw_arrow));
     return self;
 }
-#endif
 
 #define DEFINE_STYLE_COLOR(type) \
 static VALUE \
@@ -567,9 +563,7 @@ Init_gtk_style(VALUE mGtk)
     RG_DEF_METHOD(detach, 0);
     RG_DEF_METHOD(set_background, 2);
     RG_DEF_METHOD(apply_default_background, 8);
-#if GTK_CHECK_VERSION(2,10,0)
     RG_DEF_METHOD(lookup_color, 1);
-#endif
     RG_DEF_METHOD(lookup_icon_set, 1);
     RG_DEF_METHOD(render_icon, 6);
     RG_DEF_METHOD(paint_arrow, 12);
@@ -592,9 +586,7 @@ Init_gtk_style(VALUE mGtk)
     RG_DEF_METHOD(paint_expander, 8);
     RG_DEF_METHOD(paint_layout, 9);
     RG_DEF_METHOD(paint_resize_grip, 10);
-#if GTK_CHECK_VERSION(2,4,0)
     RG_DEF_SMETHOD(draw_insertion_cursor, 7);
-#endif
     rb_define_method(RG_TARGET_NAMESPACE, "fg", style_fg, 1);
     rb_define_method(RG_TARGET_NAMESPACE, "bg", style_bg, 1);
     rb_define_method(RG_TARGET_NAMESPACE, "light", style_light, 1);

data/ext/gtk2/rbgtktargetlist.c

@@ -24,32 +24,6 @@
 #define RG_TARGET_NAMESPACE cTargetList
 #define _SELF(r) ((GtkTargetList*)RVAL2BOXED(r, GTK_TYPE_TARGET_LIST))
 
-/**********************************/
-#if ! GTK_CHECK_VERSION(2,10,0) 
-static GtkTargetList*
-rbgtk_target_list_copy(const GtkTargetList* list)
-{
-  GtkTargetList* new_list;
-  g_return_val_if_fail (list != NULL, NULL);
-  new_list = g_new(GtkTargetList, 1);
-  *new_list = *list;
-  return new_list;
-}
-
-GType
-gtk_target_list_get_type(void)
-{
-    static GType our_type = 0;
-
-    if (our_type == 0)
-        our_type = g_boxed_type_register_static ("GtkTargetList",
-                    (GBoxedCopyFunc)rbgtk_target_list_copy,
-                    (GBoxedFreeFunc)gtk_target_list_unref);
-    return our_type;
-}
-#endif
-/**********************************/
-
 static VALUE
 rg_initialize(VALUE self, VALUE rbtargets)
 {
@@ -86,7 +60,6 @@ rg_add_table(VALUE self, VALUE rbtargets)
     return self;
 }
 
-#if GTK_CHECK_VERSION(2,6,0)
 static VALUE
 rg_add_text_targets(VALUE self, VALUE info)
 {
@@ -107,9 +80,7 @@ rg_add_uri_targets(VALUE self, VALUE info)
     gtk_target_list_add_uri_targets(_SELF(self), NUM2UINT(info));
     return self;
 }
-#endif
 
-#if GTK_CHECK_VERSION(2,10,0)
 static VALUE
 rg_add_rich_text_targets(VALUE self, VALUE info, VALUE deserializable, VALUE buffer)
 {
@@ -118,7 +89,6 @@ rg_add_rich_text_targets(VALUE self, VALUE info, VALUE deserializable, VALUE buf
                                           GTK_TEXT_BUFFER(RVAL2GOBJ(buffer)));
     return self;
 }
-#endif
 
 static VALUE
 rg_remove(VALUE self, VALUE target)
@@ -146,14 +116,10 @@ Init_gtk_target_list(VALUE mGtk)
     RG_DEF_METHOD(initialize, 1);
     RG_DEF_METHOD(add, 3);
     RG_DEF_METHOD(add_table, 1);
-#if GTK_CHECK_VERSION(2,6,0)
     RG_DEF_METHOD(add_text_targets, 1);
     RG_DEF_METHOD(add_image_targets, 2);
     RG_DEF_METHOD(add_uri_targets, 1);
-#endif
-#if GTK_CHECK_VERSION(2,10,0)
     RG_DEF_METHOD(add_rich_text_targets, 3);
-#endif
     RG_DEF_METHOD(remove, 1);
     RG_DEF_METHOD(find, 1);
 }

data/ext/gtk2/rbgtktextbuffer.c

@@ -68,7 +68,6 @@ txt_set_text(VALUE self, VALUE text)
     return self;
 }
 
-#if GTK_CHECK_VERSION(2,6,0)
 static VALUE
 rg_backspace(VALUE self, VALUE iter, VALUE interactive, VALUE default_editable)
 {
@@ -76,7 +75,6 @@ rg_backspace(VALUE self, VALUE iter, VALUE interactive, VALUE default_editable)
                                                 RVAL2CBOOL(interactive),
                                                 RVAL2CBOOL(default_editable)));
 }
-#endif
 
 static VALUE
 rg_insert_at_cursor(VALUE self, VALUE text)
@@ -301,14 +299,12 @@ rg_place_cursor(VALUE self, VALUE where)
     return self;
 }
 
-#if GTK_CHECK_VERSION(2,4,0)
 static VALUE
 rg_select_range(VALUE self, VALUE ins, VALUE bound)
 {
     gtk_text_buffer_select_range(_SELF(self), RVAL2ITR(ins), RVAL2ITR(bound));
     return self;
 }
-#endif
 
 static VALUE
 rg_get_iter_at_child_anchor(VALUE self, VALUE anchor)
@@ -347,7 +343,6 @@ rg_remove_selection_clipboard(VALUE self, VALUE clipboard)
     return self;
 }
 
-#if GTK_CHECK_VERSION(2,10,0)
 static VALUE
 rg_deserialize(VALUE self, VALUE content_buffer, VALUE format, VALUE iter, VALUE data)
 {
@@ -548,7 +543,6 @@ rg_unregister_serialize_format(VALUE self, VALUE format)
     gtk_text_buffer_unregister_serialize_format(_SELF(self), RVAL2ATOM(format));
     return self;
 }
-#endif
 
 static VALUE
 rg_cut_clipboard(VALUE self, VALUE clipboard, VALUE default_editable)
@@ -813,9 +807,7 @@ Init_gtk_textbuffer(VALUE mGtk)
     G_REPLACE_SET_PROPERTY(RG_TARGET_NAMESPACE, "text", txt_set_text, 1);
     RG_DEF_METHOD(insert, -1);
     RG_DEF_METHOD(insert_with_tags, -1);
-#if GTK_CHECK_VERSION(2,6,0)
     RG_DEF_METHOD(backspace, 3);
-#endif
     RG_DEF_METHOD(insert_at_cursor, 1);
     RG_DEF_METHOD(insert_interactive, 3);
     RG_DEF_METHOD(insert_interactive_at_cursor, 2);
@@ -847,16 +839,13 @@ Init_gtk_textbuffer(VALUE mGtk)
 */
     RG_DEF_METHOD(selection_bound, 0);
     RG_DEF_METHOD(place_cursor, 1);
-#if GTK_CHECK_VERSION(2,4,0)
     RG_DEF_METHOD(select_range, 2);
-#endif
     RG_DEF_METHOD_P(modified, 0);
     RG_DEF_METHOD(set_modified, 1);
     G_DEF_SETTER(RG_TARGET_NAMESPACE, "modified");
 
     RG_DEF_METHOD(add_selection_clipboard, 1);
     RG_DEF_METHOD(remove_selection_clipboard, 1);
-#if GTK_CHECK_VERSION(2,10,0)
     RG_DEF_METHOD(deserialize, 4);
     RG_DEF_METHOD_P(deserialize_can_create_tags, 1);
     RG_DEF_METHOD(deserialize_set_can_create_tags, 2);
@@ -869,7 +858,6 @@ Init_gtk_textbuffer(VALUE mGtk)
     RG_DEF_METHOD(serialize, 4);
     RG_DEF_METHOD(unregister_deserialize_format, 1);
     RG_DEF_METHOD(unregister_serialize_format, 1);
-#endif
     RG_DEF_METHOD(cut_clipboard, 2);
     RG_DEF_METHOD(copy_clipboard, 1);
     RG_DEF_METHOD(paste_clipboard, 3);

data/ext/gtk2/rbgtktextiter.c

@@ -227,7 +227,6 @@ def_move(backward_sentence_start)
 def_move_gint(forward_sentence_ends)
 def_move_gint(backward_sentence_starts)
 
-#if GTK_CHECK_VERSION(2,4,0)
 def_move_gint(forward_visible_word_ends)
 def_move_gint(backward_visible_word_starts)
 def_move(forward_visible_word_end)
@@ -236,13 +235,10 @@ def_move(forward_visible_cursor_position)
 def_move(backward_visible_cursor_position)
 def_move_gint(forward_visible_cursor_positions)
 def_move_gint(backward_visible_cursor_positions)
-#endif
-#if GTK_CHECK_VERSION(2,8,0)
 def_move(forward_visible_line)
 def_move(backward_visible_line)
 def_move_gint(forward_visible_lines)
 def_move_gint(backward_visible_lines)
-#endif
 def_move(forward_cursor_position)
 def_move(backward_cursor_position)
 def_move_gint(forward_cursor_positions)
@@ -465,7 +461,6 @@ Init_gtk_textiter(VALUE mGtk)
     rb_define_method(RG_TARGET_NAMESPACE, "forward_sentence_ends", forward_sentence_ends, 1);
     rb_define_method(RG_TARGET_NAMESPACE, "backward_sentence_starts", backward_sentence_starts, 1);
 
-#if GTK_CHECK_VERSION(2,4,0)
     rb_define_method(RG_TARGET_NAMESPACE, "forward_visible_word_ends", forward_visible_word_ends, 1);
     rb_define_method(RG_TARGET_NAMESPACE, "backward_visible_word_starts", backward_visible_word_starts, 1);
     rb_define_method(RG_TARGET_NAMESPACE, "forward_visible_word_end", forward_visible_word_end, 0);
@@ -474,13 +469,10 @@ Init_gtk_textiter(VALUE mGtk)
     rb_define_method(RG_TARGET_NAMESPACE, "backward_visible_cursor_position", backward_visible_cursor_position, 0);
     rb_define_method(RG_TARGET_NAMESPACE, "forward_visible_cursor_positions", forward_visible_cursor_positions, 1);
     rb_define_method(RG_TARGET_NAMESPACE, "backward_visible_cursor_positions", backward_visible_cursor_positions, 1); 
-#endif
-#if GTK_CHECK_VERSION(2,8,0)
     rb_define_method(RG_TARGET_NAMESPACE, "forward_visible_line", forward_visible_line, 0); 
     rb_define_method(RG_TARGET_NAMESPACE, "backward_visible_line", backward_visible_line, 0); 
     rb_define_method(RG_TARGET_NAMESPACE, "forward_visible_lines", forward_visible_lines, 1); 
     rb_define_method(RG_TARGET_NAMESPACE, "backward_visible_lines", backward_visible_lines, 1); 
-#endif
     rb_define_method(RG_TARGET_NAMESPACE, "forward_cursor_position", forward_cursor_position, 0);
     rb_define_method(RG_TARGET_NAMESPACE, "backward_cursor_position", backward_cursor_position, 0);
     rb_define_method(RG_TARGET_NAMESPACE, "forward_cursor_positions", forward_cursor_positions, 1);

data/ext/gtk2/rbgtktextview.c

@@ -144,7 +144,6 @@ rg_get_iter_at_location(VALUE self, VALUE x, VALUE y)
     return ITR2RVAL(&iter);
 }
 
-#if GTK_CHECK_VERSION(2,6,0)
 static VALUE
 rg_get_iter_at_position(VALUE self, VALUE x, VALUE y)
 {
@@ -153,7 +152,6 @@ rg_get_iter_at_position(VALUE self, VALUE x, VALUE y)
     gtk_text_view_get_iter_at_position(_SELF(self), &iter, &trailing, NUM2INT(x), NUM2INT(y));
     return rb_assoc_new(ITR2RVAL(&iter), INT2NUM(trailing));
 }
-#endif
 
 static VALUE
 rg_buffer_to_window_coords(VALUE self, VALUE wintype, VALUE buffer_x, VALUE buffer_y)
@@ -301,9 +299,7 @@ Init_gtk_textview(VALUE mGtk)
     RG_DEF_METHOD(get_line_at_y, 1);
     RG_DEF_METHOD(get_line_yrange, 1);
     RG_DEF_METHOD(get_iter_at_location, 2);
-#if GTK_CHECK_VERSION(2,6,0)
     RG_DEF_METHOD(get_iter_at_position, 2);
-#endif
     RG_DEF_METHOD(buffer_to_window_coords, 3);
     RG_DEF_METHOD(window_to_buffer_coords, 3);
     RG_DEF_METHOD(get_window, 1);

data/ext/gtk2/rbgtktoggleaction.c

@@ -21,8 +21,6 @@
 
 #include "global.h"
 
-#if GTK_CHECK_VERSION(2,4,0)
-
 #define RG_TARGET_NAMESPACE cToggleAction
 #define _SELF(self) (GTK_TOGGLE_ACTION(RVAL2GOBJ(self)))
 
@@ -51,16 +49,11 @@ rg_toggled(VALUE self)
     return self;
 }
 
-#endif
-
 void 
 Init_gtk_toggle_action(VALUE mGtk)
 {
-#if GTK_CHECK_VERSION(2,4,0)
-
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_TOGGLE_ACTION, "ToggleAction", mGtk);
 
     RG_DEF_METHOD(initialize, 4);
     RG_DEF_METHOD(toggled, 0);
-#endif
 }

data/ext/gtk2/rbgtktoggletoolbutton.c

@@ -21,8 +21,6 @@
 
 #include "global.h"
 
-#if GTK_CHECK_VERSION(2,4,0)
-
 #define RG_TARGET_NAMESPACE cToggleToolButton
 #define _SELF(self) (GTK_TOGGLE_TOOL_BUTTON(RVAL2GOBJ(self)))
 
@@ -47,14 +45,10 @@ rg_initialize(int argc, VALUE *argv, VALUE self)
     return Qnil;
 }
 
-#endif
-
 void 
 Init_gtk_toggletoolbutton(VALUE mGtk)
 {
-#if GTK_CHECK_VERSION(2,4,0)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_TOGGLE_TOOL_BUTTON, "ToggleToolButton", mGtk);
 
     RG_DEF_METHOD(initialize, -1);
-#endif
 }

data/ext/gtk2/rbgtktoolbar.c

@@ -182,13 +182,11 @@ rg_insert(int argc, VALUE *argv, VALUE self)
                                        N_RVAL2CSTR(ttext), N_RVAL2CSTR(ptext),
                                        GTK_SIGNAL_FUNC(exec_callback),
                                        (gpointer)func, NUM2INT(pos));
-#if GTK_CHECK_VERSION(2,4,0)
     } else if (rb_obj_is_kind_of(type, GTYPE2CLASS(GTK_TYPE_TOOL_ITEM))){
         rb_scan_args(argc, argv, "20", &pos, &widget);
         gtk_toolbar_insert(_SELF(self), GTK_TOOL_ITEM(RVAL2GOBJ(widget)),
                            NUM2INT(pos));
         return widget;
-#endif
     } else {
         rb_scan_args(argc, argv, "22", &pos, &widget, &ttext, &ptext);
         gtk_toolbar_insert_widget(_SELF(self), GTK_WIDGET(RVAL2GOBJ(widget)),
@@ -200,7 +198,6 @@ rg_insert(int argc, VALUE *argv, VALUE self)
     return ret ? GOBJ2RVAL(ret) : Qnil;
 }
 
-#if GTK_CHECK_VERSION(2,4,0)
 static VALUE
 rg_item_index(VALUE self, VALUE item)
 {
@@ -239,7 +236,6 @@ rg_relief_style(VALUE self)
 {
     return GENUM2RVAL(gtk_toolbar_get_relief_style(_SELF(self)), GTK_TYPE_RELIEF_STYLE);
 }
-#endif
 
 static VALUE
 rg_append_space(VALUE self)
@@ -289,14 +285,12 @@ Init_gtk_toolbar(VALUE mGtk)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_TOOLBAR, "Toolbar", mGtk);
 
     RG_DEF_METHOD(initialize, 0);
-#if GTK_CHECK_VERSION(2,4,0)
     RG_DEF_METHOD(item_index, 1);
     RG_DEF_METHOD(n_items, 0);
     RG_DEF_METHOD(nth_item, 1);
     RG_DEF_METHOD(drop_index, 2);
     RG_DEF_METHOD(set_drop_highlight_item, 2);
     RG_DEF_METHOD(relief_style, 0);
-#endif
     RG_DEF_METHOD(append, -1);
     RG_DEF_METHOD(prepend, -1);
     RG_DEF_METHOD(insert, -1);

data/ext/gtk2/rbgtktoolbutton.c

@@ -21,8 +21,6 @@
 
 #include "global.h"
 
-#if GTK_CHECK_VERSION(2,4,0)
-
 #define RG_TARGET_NAMESPACE cToolButton
 #define _SELF(self) (GTK_TOOL_BUTTON(RVAL2GOBJ(self)))
 
@@ -46,14 +44,10 @@ rg_initialize(int argc, VALUE *argv, VALUE self)
     return Qnil;
 }
 
-#endif
-
 void 
 Init_gtk_toolbutton(VALUE mGtk)
 {
-#if GTK_CHECK_VERSION(2,4,0)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_TOOL_BUTTON, "ToolButton", mGtk);
 
     RG_DEF_METHOD(initialize, -1);
-#endif
 }

data/ext/gtk2/rbgtktoolitem.c

@@ -21,8 +21,6 @@
 
 #include "global.h"
 
-#if GTK_CHECK_VERSION(2,4,0)
-
 #define RG_TARGET_NAMESPACE cToolItem
 #define _SELF(self) (GTK_TOOL_ITEM(RVAL2GOBJ(self)))
 
@@ -126,20 +124,16 @@ rg_set_proxy_menu_item(VALUE self, VALUE menu_item_id, VALUE menu_item)
     return self;
 }
 
-#if GTK_CHECK_VERSION(2,6,0)
 static VALUE
 rg_rebuild_menu(VALUE self)
 {
     gtk_tool_item_rebuild_menu(_SELF(self));
     return self;
 }
-#endif
-#endif
 
 void 
 Init_gtk_toolitem(VALUE mGtk)
 {
-#if GTK_CHECK_VERSION(2,4,0)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_TOOL_ITEM, "ToolItem", mGtk);
     RG_DEF_METHOD(initialize, 0);
     RG_DEF_METHOD(set_homogeneous, 1);
@@ -159,8 +153,5 @@ Init_gtk_toolitem(VALUE mGtk)
     RG_DEF_METHOD(retrieve_proxy_menu_item, 0);
     RG_DEF_METHOD(get_proxy_menu_item, 1);
     RG_DEF_METHOD(set_proxy_menu_item, 2);
-#if GTK_CHECK_VERSION(2,6,0)
     RG_DEF_METHOD(rebuild_menu, 0);
-#endif
-#endif
 }

data/ext/gtk2/rbgtktooltips.c

@@ -75,7 +75,6 @@ rg_force_window(VALUE self)
     return self;
 }
 
-#if GTK_CHECK_VERSION(2,4,0)
 static VALUE
 rg_s_get_info(G_GNUC_UNUSED VALUE self, VALUE window)
 {
@@ -89,7 +88,6 @@ rg_s_get_info(G_GNUC_UNUSED VALUE self, VALUE window)
     else
         return Qnil;
 }
-#endif
 
 void 
 Init_gtk_tooltips(VALUE mGtk)
@@ -101,8 +99,6 @@ Init_gtk_tooltips(VALUE mGtk)
     RG_DEF_METHOD(enable, 0);
     RG_DEF_METHOD(disable, 0);
     RG_DEF_METHOD(force_window, 0);
-#if GTK_CHECK_VERSION(2,4,0)
     RG_DEF_SMETHOD(get_info, 1);
-#endif
     RG_DEF_SMETHOD(get_data, 1);
 }