gtk2 1.1.2 → 1.1.3

data/ext/gtk2/global.h

@@ -32,6 +32,13 @@
 #  include <st.h>
 #endif
 
+#undef RG_DEF_METHOD
+#define RG_DEF_METHOD(method, argc) \
+        rb_define_method(RG_TARGET_NAMESPACE, #method, rg_ ## method, argc)
+#undef RG_DEF_SMETHOD
+#define RG_DEF_SMETHOD(method, argc) \
+        rb_define_singleton_method(RG_TARGET_NAMESPACE, #method, rg_s_ ## method, argc)
+
 #ifndef HAVE_RB_ERRINFO
 #  define rb_errinfo() (ruby_errinfo)
 #endif
@@ -176,6 +183,7 @@ G_GNUC_INTERNAL void Init_gtk_image_menu_item(VALUE mGtk);
 G_GNUC_INTERNAL void Init_gtk_imcontext(VALUE mGtk);
 G_GNUC_INTERNAL void Init_gtk_imcontext_simple(VALUE mGtk);
 G_GNUC_INTERNAL void Init_gtk_im_multicontext(VALUE mGtk);
+G_GNUC_INTERNAL void Init_gtk_infobar(VALUE mGtk);
 G_GNUC_INTERNAL void Init_gtk_input_dialog(VALUE mGtk);
 G_GNUC_INTERNAL void Init_gtk_invisible(VALUE mGtk);
 G_GNUC_INTERNAL void Init_gtk_item(VALUE mGtk);

data/ext/gtk2/init.c

@@ -166,6 +166,7 @@ Init_gtk2(void)
     Init_gtk_imcontext(mGtk);
     Init_gtk_imcontext_simple(mGtk);
     Init_gtk_im_multicontext(mGtk);
+    Init_gtk_infobar(mGtk);
     Init_gtk_input_dialog(mGtk);
     Init_gtk_invisible(mGtk);
     Init_gtk_item(mGtk);

data/ext/gtk2/rbgtkcolorselectiondialog.c

@@ -36,13 +36,15 @@ rg_initialize(int argc, VALUE *argv, VALUE self)
     return Qnil;
 }
 
-void 
+void
 Init_gtk_color_selection_dialog(VALUE mGtk)
 {
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_COLOR_SELECTION_DIALOG, 
                                         "ColorSelectionDialog", mGtk);
 
     RG_DEF_METHOD(initialize, -1);
+#if GTK_CHECK_VERSION(2, 14, 0)
     /* NOTE: Backward compatibility */
     RG_DEF_ALIAS("colorsel", "color_selection");
+#endif
 }

data/ext/gtk2/rbgtkconst.c

@@ -89,6 +89,10 @@ Init_gtk_const(VALUE mGtk)
     G_DEF_CLASS(GTK_TYPE_JUSTIFICATION, "Justification", mGtk);
     G_DEF_CONSTANTS(mGtk, GTK_TYPE_JUSTIFICATION, "GTK_");
 
+    /* GtkMessageType */
+    G_DEF_CLASS(GTK_TYPE_MESSAGE_TYPE, "MessageType", mGtk);
+    G_DEF_CONSTANTS(mGtk, GTK_TYPE_MESSAGE_TYPE, "GTK_MESSAGE_");
+
     /* GtkMetricType */
     G_DEF_CLASS(GTK_TYPE_METRIC_TYPE, "MetricType", mGtk);
     G_DEF_CONSTANTS(mGtk, GTK_TYPE_METRIC_TYPE, "GTK_");
@@ -129,6 +133,10 @@ Init_gtk_const(VALUE mGtk)
     G_DEF_CLASS(GTK_TYPE_RESIZE_MODE, "ResizeMode", mGtk);
     G_DEF_CONSTANTS(mGtk, GTK_TYPE_RESIZE_MODE, "GTK_");
 
+    /* GtkResponseType */
+    G_DEF_CLASS(GTK_TYPE_RESPONSE_TYPE, "ResponseType", 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);

data/ext/gtk2/rbgtkinfobar.c

@@ -0,0 +1,147 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/*
+ *  Copyright (C) 2012  Ruby-GNOME2 Project Team
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
+
+#include "global.h" 
+
+#if GTK_CHECK_VERSION(2,18,0)
+#define RG_TARGET_NAMESPACE cInfoBar
+#define _SELF(self) (GTK_INFO_BAR(RVAL2GOBJ(self)))
+
+static VALUE
+rg_initialize(int argc, VALUE *argv, VALUE self)
+{
+    if (argc == 0){
+        RBGTK_INITIALIZE(self, gtk_info_bar_new ());
+    } else if (argc > 0){
+        //TODO gtk_info_bar_new_with_buttons
+        rb_raise(rb_eArgError, "method does not yet supported adding buttons");
+       } else {
+        rb_raise(rb_eArgError, "invalid argument number");
+    }
+    return Qnil;
+}
+
+static VALUE
+rg_get_action_area(VALUE self)
+{
+    return GOBJ2RVAL(gtk_info_bar_get_action_area(_SELF(self)));
+}
+
+static VALUE
+rg_get_content_area(VALUE self)
+{
+    return GOBJ2RVAL(gtk_info_bar_get_content_area(_SELF(self)));
+}
+
+static VALUE
+rg_get_message_type(VALUE self)
+{
+    return GENUM2RVAL(gtk_info_bar_get_message_type(_SELF(self)),
+                      GTK_TYPE_MESSAGE_TYPE);
+}
+
+static VALUE
+rg_set_message_type(VALUE self, VALUE type)
+{
+    gtk_info_bar_set_message_type(_SELF(self),
+                                  RVAL2GENUM(type, GTK_TYPE_MESSAGE_TYPE));
+    return self;
+}
+
+static VALUE
+rg_set_default_response(VALUE self, VALUE response_id)
+{
+    gtk_info_bar_set_default_response(_SELF(self),
+                                      RVAL2GENUM(response_id, GTK_TYPE_RESPONSE_TYPE));
+    return self;
+}
+
+static VALUE
+rg_add_action_widget(VALUE self, VALUE widget, VALUE response_id)
+{
+    gtk_info_bar_add_action_widget(_SELF(self),
+                                   GTK_WIDGET(RVAL2GOBJ(widget)), 
+                                   RVAL2GENUM(response_id, GTK_TYPE_RESPONSE_TYPE));
+    return self;
+}
+
+static VALUE
+rg_add_button(VALUE self, VALUE button_text, VALUE response_id)
+{
+    const gchar *name;
+    if (SYMBOL_P(button_text)) {
+        name = rb_id2name(SYM2ID(button_text));
+    } else {
+        name = RVAL2CSTR(button_text);
+    }
+    return GOBJ2RVAL(gtk_info_bar_add_button(_SELF(self), name, 
+                                             RVAL2GENUM(response_id, GTK_TYPE_RESPONSE_TYPE)));
+}
+
+/*
+static VALUE
+rg_add_buttons(int argc, VALUE *argv, VALUE self)
+{
+}
+*/
+
+static VALUE
+rg_set_response_sensitive(VALUE self, VALUE response_id, VALUE sensitive)
+{
+     gtk_info_bar_set_response_sensitive(_SELF(self),
+                                         RVAL2GENUM(response_id, GTK_TYPE_RESPONSE_TYPE),
+                                         RVAL2CBOOL(sensitive));
+     return self;
+}
+
+static VALUE
+rg_response(VALUE self, VALUE response_id)
+{
+    gtk_info_bar_response(_SELF(self), RVAL2GENUM(response_id, GTK_TYPE_RESPONSE_TYPE));
+    return self;
+}
+#endif
+
+void 
+Init_gtk_infobar(VALUE mGtk)
+{
+#if GTK_CHECK_VERSION(2,18,0)
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_INFO_BAR, "InfoBar", mGtk);
+
+    RG_DEF_METHOD(initialize, -1);
+    RG_DEF_METHOD(get_action_area, 0);
+    RG_DEF_ALIAS("action_area", "get_action_area");
+    RG_DEF_METHOD(get_content_area, 0);
+    RG_DEF_ALIAS("content_area", "get_content_area");
+    RG_DEF_METHOD(get_message_type, 0);
+    RG_DEF_ALIAS("message_type", "get_message_type");
+    RG_DEF_METHOD(set_message_type, 1);
+    G_DEF_SETTER(RG_TARGET_NAMESPACE, "message_type");
+    RG_DEF_METHOD(set_default_response, 1);
+    RG_DEF_METHOD(add_action_widget, 2);
+    RG_DEF_METHOD(add_button, 2);
+/*
+    RG_DEF_METHOD(add_buttons, -1);
+*/
+    RG_DEF_METHOD(set_response_sensitive, 2);
+    RG_DEF_METHOD(response, 1);
+#endif
+}
+

data/ext/gtk2/rbgtkprintsettings.c

@@ -58,7 +58,7 @@ rg_initialize(int argc, VALUE *argv, VALUE self)
 }
 #else
 static VALUE
-ps_initialize(VALUE self)
+rg_initialize(VALUE self)
 {
     G_INITIALIZE(self, gtk_print_settings_new());
     return Qnil;

data/ext/gtk2/rbgtktreeviewcolumn.c

@@ -246,6 +246,21 @@ rg_tree_view(VALUE self)
 }
 #endif
 
+#if !GTK_CHECK_VERSION(2,18,0)
+static VALUE
+rg_sort_column_id(VALUE self)
+{
+    return INT2NUM(gtk_tree_view_column_get_sort_column_id(_SELF(self)));
+}
+
+static VALUE
+rg_set_sort_column_id(VALUE self, VALUE id)
+{
+    gtk_tree_view_column_set_sort_column_id(_SELF(self), NUM2INT(id));
+    return self;
+}
+#endif
+
 void
 Init_gtk_treeviewcolumn(VALUE mGtk)
 {
@@ -272,6 +287,11 @@ Init_gtk_treeviewcolumn(VALUE mGtk)
 #endif
 #if GTK_CHECK_VERSION(2,12,0)
     RG_DEF_METHOD(tree_view, 0);
+#endif
+#if !GTK_CHECK_VERSION(2,18,0)
+    RG_DEF_METHOD(sort_column_id, 0);
+    RG_DEF_METHOD(set_sort_column_id, 1);
+    RG_DEF_ALIAS("sort_column_id=", "set_sort_column_id");
 #endif
     /* GtkTreeViewColumnSizing */
     G_DEF_CLASS(GTK_TYPE_TREE_VIEW_COLUMN_SIZING, "Sizing", RG_TARGET_NAMESPACE);

data/sample/misc/infobar.rb

@@ -0,0 +1,24 @@
+#!/usr/bin/env ruby
+
+require 'gtk2'
+
+label=Gtk::Label.new.show
+
+info=Gtk::InfoBar.new
+info.no_show_all=true
+info.content_area.add(label)
+info.add_button(Gtk::Stock::OK, Gtk::ResponseType::OK)
+info.signal_connect('response'){|info, response| info.hide}
+
+w=Gtk::Window.new
+w.add(info)
+w.show_all
+w.signal_connect("delete_event"){Gtk.main_quit}
+
+GLib::Timeout.add_seconds(1){
+  label.text='ERROR'
+  info.message_type=Gtk::MessageType::ERROR
+  info.show
+  false
+}
+Gtk.main

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gtk2
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 3
+  version: 1.1.3
 platform: ruby
 authors: 
 - The Ruby-GNOME2 Project Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-15 00:00:00 Z
+date: 2012-04-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: atk
@@ -25,12 +25,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 21
         segments: 
         - 1
         - 1
-        - 2
-        version: 1.1.2
+        - 3
+        version: 1.1.3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -41,12 +41,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 21
         segments: 
         - 1
         - 1
-        - 2
-        version: 1.1.2
+        - 3
+        version: 1.1.3
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -57,12 +57,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 21
         segments: 
         - 1
         - 1
-        - 2
-        version: 1.1.2
+        - 3
+        version: 1.1.3
   type: :runtime
   version_requirements: *id003
 description: Ruby/GTK2 is a Ruby binding of GTK+-2.x.
@@ -133,6 +133,7 @@ files:
 - ext/gtk2/rbgtkfilechooser.c
 - ext/gtk2/rbgdkatom.c
 - ext/gtk2/rbgtkvbox.c
+- ext/gtk2/rbgtkinfobar.c
 - ext/gtk2/rbgdkcolor.c
 - ext/gtk2/rbgtktreemodel.c
 - ext/gtk2/rbgtkcurve.c
@@ -433,6 +434,7 @@ files:
 - sample/misc/linkbutton.rb
 - sample/misc/dndtreeview.rb
 - sample/misc/scalebutton.rb
+- sample/misc/infobar.rb
 - sample/misc/combo_check.rb
 - sample/misc/stock.rb
 - sample/misc/xbm_cursor.rb
@@ -567,7 +569,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Ruby/GTK2 is a Ruby binding of GTK+-2.x.