gtk2 2.0.2 → 2.0.3

data/ext/gtk2/rbgtkpagesetup.c

@@ -21,8 +21,6 @@
 
 #include "global.h"
 
-#if GTK_CHECK_VERSION(2,10,0)
-
 #define RG_TARGET_NAMESPACE cPageSetup
 #define _SELF(s) (GTK_PAGE_SETUP(RVAL2GOBJ(s)))
 
@@ -167,12 +165,10 @@ rg_get_page_height(VALUE self, VALUE unit)
     return rb_float_new(gtk_page_setup_get_page_height(_SELF(self),
                                                         RVAL2UNIT(unit)));
 }
-#endif
 
 void
 Init_gtk_page_setup(VALUE mGtk)
 {
-#if GTK_CHECK_VERSION(2,10,0)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_PAGE_SETUP, "PageSetup", mGtk);
 
     RG_DEF_METHOD(initialize, 0);
@@ -202,5 +198,4 @@ Init_gtk_page_setup(VALUE mGtk)
     RG_DEF_METHOD(get_page_height, 1);
 
     G_DEF_SETTERS(RG_TARGET_NAMESPACE);
-#endif
 }

data/ext/gtk2/rbgtkpapersize.c

@@ -21,8 +21,6 @@
 
 #include "global.h"
 
-#if GTK_CHECK_VERSION(2,10,0)
-
 #define RG_TARGET_NAMESPACE cPaperSize
 #define _SELF(s) (RVAL2BOXED(s, GTK_TYPE_PAPER_SIZE))
 #define SIZE2RVAL(o) (BOXED2RVAL(o, GTK_TYPE_PAPER_SIZE))
@@ -144,12 +142,10 @@ rg_s_default(G_GNUC_UNUSED VALUE self)
 {
     return CSTR2RVAL(gtk_paper_size_get_default());
 }
-#endif
 
 void
 Init_gtk_paper_size(VALUE mGtk)
 {
-#if GTK_CHECK_VERSION(2,10,0)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_PAPER_SIZE, "PaperSize", mGtk);
 
     RG_DEF_SMETHOD(default, 0);
@@ -187,6 +183,4 @@ Init_gtk_paper_size(VALUE mGtk)
     /* GtkUnit */
     G_DEF_CLASS(GTK_TYPE_UNIT, "Unit", RG_TARGET_NAMESPACE);
     G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GTK_TYPE_UNIT, "GTK_");
-
-#endif
 }

data/ext/gtk2/rbgtkprintcontext.c

@@ -21,8 +21,6 @@
 
 #include "global.h"
 
-#if GTK_CHECK_VERSION(2,10,0)
-
 #define RG_TARGET_NAMESPACE cPrintContext
 #define _SELF(s) (GTK_PRINT_CONTEXT(RVAL2GOBJ(s)))
 
@@ -98,12 +96,10 @@ rg_set_cairo_context(VALUE self, VALUE cr, VALUE dpi_x, VALUE dpi_y)
     return self;
 }
 #  endif
-#endif
 
 void
 Init_gtk_print_context(VALUE mGtk)
 {
-#if GTK_CHECK_VERSION(2,10,0)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_PRINT_CONTEXT,
                                       "PrintContext", mGtk);
 
@@ -128,5 +124,4 @@ Init_gtk_print_context(VALUE mGtk)
 #  endif
 
     G_DEF_SETTERS(RG_TARGET_NAMESPACE);
-#endif
 }

data/ext/gtk2/rbgtkprintoperation.c

@@ -21,8 +21,6 @@
 
 #include "global.h"
 
-#if GTK_CHECK_VERSION(2,10,0)
-
 #define RG_TARGET_NAMESPACE cPrintOperation
 #define _SELF(s) (GTK_PRINT_OPERATION(RVAL2GOBJ(s)))
 
@@ -127,12 +125,10 @@ rg_s_run_page_setup_dialog(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
                                                           RVAL2GOBJ(settings)));
     }
 }
-#endif
 
 void
 Init_gtk_print_operation(VALUE mGtk)
 {
-#if GTK_CHECK_VERSION(2,10,0)
     RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_PRINT_OPERATION, "PrintOperation", mGtk);
 
     G_DEF_ERROR(GTK_PRINT_ERROR, "PrintError", mGtk, rb_eRuntimeError,
@@ -157,5 +153,4 @@ Init_gtk_print_operation(VALUE mGtk)
     /* GtkPrintOperationResult */
     G_DEF_CLASS(GTK_TYPE_PRINT_OPERATION_RESULT, "Result", RG_TARGET_NAMESPACE);
     G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GTK_TYPE_PRINT_OPERATION_RESULT, "GTK_PRINT_OPERATION_");
-#endif
 }

data/ext/gtk2/rbgtkprintoperationpreview.c

@@ -21,8 +21,6 @@
 
 #include "global.h"
 
-#if GTK_CHECK_VERSION(2,10,0)
-
 #define RG_TARGET_NAMESPACE cPrintOperationPreview
 #define _SELF(s) (GTK_PRINT_OPERATION_PREVIEW(RVAL2GOBJ(s)))
 
@@ -48,12 +46,10 @@ rg_selected_p(VALUE self, VALUE page_number)
                                                        NUM2INT(page_number));
     return CBOOL2RVAL(selected);
 }
-#endif
 
 void
 Init_gtk_print_operation_preview(VALUE mGtk)
 {
-#if GTK_CHECK_VERSION(2,10,0)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_PRINT_OPERATION_PREVIEW,
                                                "PrintOperationPreview", mGtk);
 
@@ -62,5 +58,4 @@ Init_gtk_print_operation_preview(VALUE mGtk)
     RG_DEF_METHOD_P(selected, 1);
 
     G_DEF_SETTERS(RG_TARGET_NAMESPACE);
-#endif
 }

data/ext/gtk2/rbgtkprintsettings.c

@@ -21,8 +21,6 @@
 
 #include "global.h"
 
-#if GTK_CHECK_VERSION(2,10,0)
-
 #define RG_TARGET_NAMESPACE cPrintSettings
 #define _SELF(s) (GTK_PRINT_SETTINGS(RVAL2GOBJ(s)))
 
@@ -657,7 +655,6 @@ rg_set_output_bin(VALUE self, VALUE output_bin)
     gtk_print_settings_set_output_bin(_SELF(self), RVAL2CSTR_ACCEPT_NIL(output_bin));
     return self;
 }
-#endif
 
 #if GTK_CHECK_VERSION(2,12,0)
 static VALUE
@@ -684,7 +681,6 @@ rg_to_key_file(int argc, VALUE *argv, VALUE self)
 void
 Init_gtk_print_settings(VALUE mGtk)
 {
-#if GTK_CHECK_VERSION(2,10,0)
     VALUE RG_TARGET_NAMESPACE;
 
     s_string = ID2SYM(rb_intern("string"));
@@ -839,7 +835,6 @@ Init_gtk_print_settings(VALUE mGtk)
     /* GtkPageSet */
     G_DEF_CLASS(GTK_TYPE_PAGE_SET, "PageSet", RG_TARGET_NAMESPACE);
     G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GTK_TYPE_PAGE_SET, "GTK_");
-#endif
 #if GTK_CHECK_VERSION(2,12,0)
     RG_DEF_METHOD(to_file, 1);
     RG_DEF_METHOD(to_key_file, -1);

data/ext/gtk2/rbgtkradioaction.c

@@ -21,8 +21,6 @@
 
 #include "global.h"
 
-#if GTK_CHECK_VERSION(2,4,0)
-
 #define RG_TARGET_NAMESPACE cRadioAction
 #define _SELF(self) (GTK_RADIO_ACTION(RVAL2GOBJ(self)))
 
@@ -111,28 +109,12 @@ raction_set_group(VALUE self, VALUE rbgroup)
     return self;
 }
 
-#if ! GTK_CHECK_VERSION(2,10,0)
-static VALUE
-rg_current_value(VALUE self)
-{
-    return INT2NUM(gtk_radio_action_get_current_value(_SELF(self)));
-}
-#endif
-
-#endif
-
 void 
 Init_gtk_radio_action(VALUE mGtk)
 {
-#if GTK_CHECK_VERSION(2,4,0)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_RADIO_ACTION, "RadioAction", mGtk);
 
     RG_DEF_METHOD(initialize, 5);
-#if ! GTK_CHECK_VERSION(2,10,0)
-    /* Define as Property since 2.10 */
-    RG_DEF_METHOD(current_value, 0);
-#endif
     G_REPLACE_GET_PROPERTY(RG_TARGET_NAMESPACE, "group", raction_get_group, 0);
     G_REPLACE_SET_PROPERTY(RG_TARGET_NAMESPACE, "group", raction_set_group, 1);
-#endif
 }

data/ext/gtk2/rbgtkradiotoolbutton.c

@@ -21,8 +21,6 @@
 
 #include "global.h"
 
-#if GTK_CHECK_VERSION(2,4,0)
-
 #define RG_TARGET_NAMESPACE cRadioToolButton
 #define _SELF(self) (GTK_RADIO_TOOL_BUTTON(RVAL2GOBJ(self)))
 
@@ -123,16 +121,12 @@ rbtn_set_group(VALUE self, VALUE rbgroup)
     return self;
 }
 
-#endif
-
 void 
 Init_gtk_radiotoolbutton(VALUE mGtk)
 {
-#if GTK_CHECK_VERSION(2,4,0)
     RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_RADIO_TOOL_BUTTON, "RadioToolButton", mGtk);
 
     RG_DEF_METHOD(initialize, -1);
     G_REPLACE_GET_PROPERTY(RG_TARGET_NAMESPACE, "group", rbtn_get_group, 0);
     G_REPLACE_SET_PROPERTY(RG_TARGET_NAMESPACE, "group", rbtn_set_group, 1);
-#endif
 }

data/ext/gtk2/rbgtkrange.c

@@ -65,9 +65,7 @@ Init_gtk_range(VALUE mGtk)
   RG_DEF_METHOD(set_value, 1);
   G_DEF_SETTER(RG_TARGET_NAMESPACE, "value");
 
-#if GTK_CHECK_VERSION(2,10,0)
   /* GtkSensitivityType */
   G_DEF_CLASS(GTK_TYPE_SENSITIVITY_TYPE, "SensitivityType", RG_TARGET_NAMESPACE);
   G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GTK_TYPE_SENSITIVITY_TYPE, "GTK_");
-#endif
 }

data/ext/gtk2/rbgtkrc.c

@@ -99,14 +99,12 @@ rg_m_reparse_all_for_settings(G_GNUC_UNUSED VALUE self, VALUE settings, VALUE fo
                                                       RVAL2CBOOL(force_load)));
 }
 
-#if GTK_CHECK_VERSION(2,4,0)
 static VALUE
 rg_m_reset_styles(G_GNUC_UNUSED VALUE self, VALUE settings)
 {
     gtk_rc_reset_styles(GTK_SETTINGS(RVAL2GOBJ(settings)));
     return settings;
 }
-#endif
 
 static VALUE
 rg_m_add_default_file(G_GNUC_UNUSED VALUE self, VALUE filename)
@@ -197,9 +195,7 @@ Init_gtk_rc(VALUE mGtk)
     RG_DEF_MODFUNC(parse_string, 1);
     RG_DEF_MODFUNC(reparse_all, 0);
     RG_DEF_MODFUNC(reparse_all_for_settings, 2);
-#if GTK_CHECK_VERSION(2,4,0)
     RG_DEF_MODFUNC(reset_styles, 1);
-#endif
     RG_DEF_MODFUNC(add_default_file, 1);
     RG_DEF_MODFUNC(default_files, 0);
     RG_DEF_MODFUNC(set_default_files, 1);

data/ext/gtk2/rbgtkrecentchooser.c

@@ -21,8 +21,6 @@
 
 #include "global.h"
 
-#if GTK_CHECK_VERSION(2,10,0)
-
 #define RG_TARGET_NAMESPACE cRecentChooser
 #define _SELF(self) (GTK_RECENT_CHOOSER(RVAL2GOBJ(self)))
 
@@ -184,12 +182,10 @@ rg_filters(VALUE self)
 {
     return GSLIST2ARYF(gtk_recent_chooser_list_filters(_SELF(self)));
 }
-#endif
 
 void 
 Init_gtk_recent_chooser(VALUE mGtk)
 {
-#if GTK_CHECK_VERSION(2,10,0)
   VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_RECENT_CHOOSER, "RecentChooser", mGtk);
 
   RG_DEF_METHOD(set_show_numbers, 1);
@@ -217,6 +213,4 @@ Init_gtk_recent_chooser(VALUE mGtk)
   /* GtkRecentSortType */
   G_DEF_CLASS(GTK_TYPE_RECENT_SORT_TYPE, "SortType", RG_TARGET_NAMESPACE);
   G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GTK_TYPE_RECENT_SORT_TYPE, "GTK_RECENT_");
-#endif
-
 }

data/ext/gtk2/rbgtkrecentchooserdialog.c

@@ -21,8 +21,6 @@
 
 #include "global.h"
 
-#if GTK_CHECK_VERSION(2,10,0)
-
 #define RG_TARGET_NAMESPACE cRecentChooserDialog
 #define _SELF(self) (GTK_RECENT_CHOOSER_DIALOG(RVAL2GOBJ(self)))
 
@@ -54,14 +52,11 @@ rg_initialize(int argc, VALUE *argv, VALUE self)
     }
     return Qnil;
 }
-#endif
 
 void 
 Init_gtk_recent_chooser_dialog(VALUE mGtk)
 {
-#if GTK_CHECK_VERSION(2,10,0)
   VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_RECENT_CHOOSER_DIALOG, "RecentChooserDialog", mGtk);
 
   RG_DEF_METHOD(initialize, -1);
-#endif
 }

data/ext/gtk2/rbgtkrecentchoosermenu.c

@@ -21,8 +21,6 @@
 
 #include "global.h"
 
-#if GTK_CHECK_VERSION(2,10,0)
-
 #define RG_TARGET_NAMESPACE cRecentChooserMenu
 #define _SELF(self) (GTK_RECENT_CHOOSER_MENU(RVAL2GOBJ(self)))
 
@@ -43,14 +41,10 @@ rg_initialize(int argc, VALUE *argv, VALUE self)
     return Qnil;
 }
 
-#endif
-
 void 
 Init_gtk_recent_chooser_menu(VALUE mGtk)
 {
-#if GTK_CHECK_VERSION(2,10,0)
   VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_RECENT_CHOOSER_MENU, "RecentChooserMenu", mGtk);
 
   RG_DEF_METHOD(initialize, -1);
-#endif
 }

data/ext/gtk2/rbgtkrecentchooserwidget.c

@@ -21,8 +21,6 @@
 
 #include "global.h"
 
-#if GTK_CHECK_VERSION(2,10,0)
-
 #define RG_TARGET_NAMESPACE cRecentChooserWidget
 #define _SELF(self) (GTK_RECENT_CHOOSER_WIDGET(RVAL2GOBJ(self)))
 
@@ -40,14 +38,11 @@ rg_initialize(int argc, VALUE *argv, VALUE self)
     RBGTK_INITIALIZE(self, widget);
     return Qnil;
 }
-#endif
 
 void 
 Init_gtk_recent_chooser_widget(VALUE mGtk)
 {
-#if GTK_CHECK_VERSION(2,10,0)
   VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_RECENT_CHOOSER_WIDGET, "RecentChooserWidget", mGtk);
 
   RG_DEF_METHOD(initialize, -1);
-#endif
 }

data/ext/gtk2/rbgtkrecentdata.c

@@ -21,8 +21,6 @@
 
 #include "global.h"
 
-#if GTK_CHECK_VERSION(2,10,0)
-
 /*****************************************/
 static GtkRecentData*
 rd_copy(const GtkRecentData* data)
@@ -121,12 +119,9 @@ rg_set_private(VALUE self, VALUE is_private)
     return self;
 }
 
-#endif
-
 void
 Init_gtk_recent_data(VALUE mGtk)
 {
-#if GTK_CHECK_VERSION(2,10,0)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_RECENT_DATA, "RecentData", mGtk);
 
     RG_DEF_METHOD(initialize, 0);
@@ -146,5 +141,4 @@ Init_gtk_recent_data(VALUE mGtk)
     RG_DEF_METHOD(set_private, 1);
 
     G_DEF_SETTERS(RG_TARGET_NAMESPACE);   
-#endif
 }

data/ext/gtk2/rbgtkrecentfilter.c

@@ -21,8 +21,6 @@
 
 #include "global.h"
 
-#if GTK_CHECK_VERSION(2,10,0)
-
 #define RG_TARGET_NAMESPACE cRecentFilter
 #define _SELF(self) (GTK_RECENT_FILTER(RVAL2GOBJ(self)))
 
@@ -146,12 +144,10 @@ rg_filter(VALUE self, VALUE filter_info)
     return CBOOL2RVAL(gtk_recent_filter_filter(_SELF(self),
                                                (GtkRecentFilterInfo*)RVAL2BOXED(filter_info, GTK_TYPE_RECENT_FILTER_INFO)));
 }
-#endif
 
 void 
 Init_gtk_recent_filter(VALUE mGtk)
 {
-#if GTK_CHECK_VERSION(2,10,0)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_RECENT_FILTER, "RecentFilter", mGtk);
     RG_DEF_METHOD(initialize, 0);
     RG_DEF_METHOD(name, 0);
@@ -171,5 +167,4 @@ Init_gtk_recent_filter(VALUE mGtk)
     /* GtkRecentFilterFlags */
     G_DEF_CLASS(GTK_TYPE_RECENT_FILTER_FLAGS, "Flags", RG_TARGET_NAMESPACE);
     G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GTK_TYPE_RECENT_FILTER_FLAGS, "GTK_RECENT_FILTER_");
-#endif
 }

data/ext/gtk2/rbgtkrecentfilterinfo.c

@@ -21,8 +21,6 @@
 
 #include "global.h"
 
-#if GTK_CHECK_VERSION(2,10,0)
-
 /*****************************************/
 static GtkRecentFilterInfo*
 rf_copy(const GtkRecentFilterInfo* info)
@@ -158,12 +156,9 @@ rg_set_age(VALUE self, VALUE age)
     return self;
 }
 
-#endif
-
 void 
 Init_gtk_recent_filter_info(VALUE mGtk)
 {
-#if GTK_CHECK_VERSION(2,10,0)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_RECENT_FILTER_INFO, "RecentFilterInfo", mGtk);
 
     RG_DEF_METHOD(initialize, 0);
@@ -183,5 +178,4 @@ Init_gtk_recent_filter_info(VALUE mGtk)
     RG_DEF_METHOD(set_age, 1);
 
     G_DEF_SETTERS(RG_TARGET_NAMESPACE);   
-#endif
 }