gtk3 3.0.9 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d288fbc5d8215a6e61a6bd89726a30b91c89a7a
-  data.tar.gz: b859fb2da75b82a16c3b2e7181bc838e4c9b6c9e
+  metadata.gz: 276f1e2ef9d9e91f3c04d827a2ab1a472d8b0788
+  data.tar.gz: 65e77162cd83602533a1a57854ede3d7a3578101
 SHA512:
-  metadata.gz: 318738e160832e2222910f24e724a300c099e4e300475b745333375539375b7db9fced23d69bdab500572eaf8997103c886f270a6495330f0b5ab99f065f7724
-  data.tar.gz: 4ba9754b4242b70d30962b7409cbf71b1132170a4c43c467133f3ea503a86680276bc8bdc47e6f8e387ec7d37cb51386695b07bb0d9370c6a17eaf57fd6385af
+  metadata.gz: 3d4ed22bc6427981361addd4dfb89049c8f420373291d5aaa710c29c13c8d8fbb9803ac8b61fc9c5846de40b656f8770a3e48cd661fd24c9e372e4c6b3aeb058
+  data.tar.gz: bddf33752de735f70bfc1dcbe8ad1072c7ab527524c94cb3b15611e881128da833ef7f989941b2fcb6553eca7e7494e2919b01b6ea358b2ec60f5a41f76b311e

data/ext/gtk3/rb-gtk3-private.h

@@ -28,6 +28,7 @@ G_GNUC_INTERNAL void rbgtk3_initialize(VALUE self);
 
 G_GNUC_INTERNAL void rbgtk3_cell_layout_init(void);
 G_GNUC_INTERNAL void rbgtk3_container_init(void);
+G_GNUC_INTERNAL void rbgtk3_spin_button_init(void);
 G_GNUC_INTERNAL void rbgtk3_tree_model_init(void);
 G_GNUC_INTERNAL void rbgtk3_tree_view_init(void);
 G_GNUC_INTERNAL void rbgtk3_widget_init(void);

data/ext/gtk3/rb-gtk3-spin-button.c

@@ -0,0 +1,85 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/*
+ *  Copyright (C) 2016  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 "rb-gtk3-private.h"
+
+typedef struct {
+    RGClosureCallData *data;
+    VALUE args;
+    double *new_value;
+} InputData;
+
+static VALUE
+rb_gtk3_spin_button_input_body(VALUE user_data)
+{
+    InputData *input_data = (InputData *)user_data;
+    VALUE new_value;
+
+    new_value = rb_apply(input_data->data->callback,
+                         rb_intern("call"),
+                         input_data->args);
+    if (NIL_P(new_value)) {
+        g_value_set_int(input_data->data->return_value, FALSE);
+    } else {
+        g_value_set_int(input_data->data->return_value, TRUE);
+        *(input_data->new_value) = NUM2DBL(new_value);
+    }
+
+    return Qnil;
+}
+
+static VALUE
+rb_gtk3_spin_button_input_rescue(VALUE user_data)
+{
+    InputData *input_data = (InputData *)user_data;
+    g_value_set_int(input_data->data->return_value, GTK_INPUT_ERROR);
+    return Qnil;
+}
+
+static void
+rb_gtk3_spin_button_input(RGClosureCallData *data)
+{
+    InputData input_data;
+    VALUE args;
+
+    args = rb_ary_new_from_args(1, GVAL2RVAL(&(data->param_values[0])));
+    if (!NIL_P(data->extra_args)) {
+        rb_ary_concat(args, data->extra_args);
+    }
+    input_data.data = data;
+    input_data.args = args;
+    input_data.new_value = g_value_get_pointer(&(data->param_values[1]));
+    rb_rescue(rb_gtk3_spin_button_input_body, (VALUE)&input_data,
+              rb_gtk3_spin_button_input_rescue, (VALUE)&input_data);
+}
+
+void
+rbgtk3_spin_button_init(void)
+{
+    VALUE mGtk;
+    VALUE RG_TARGET_NAMESPACE;
+
+    mGtk = rb_const_get(rb_cObject, rb_intern("Gtk"));
+    RG_TARGET_NAMESPACE = rb_const_get(mGtk, rb_intern("SpinButton"));
+
+    rbgobj_set_signal_call_func(RG_TARGET_NAMESPACE,
+                                "input",
+                                rb_gtk3_spin_button_input);
+}

data/ext/gtk3/rb-gtk3.c

@@ -19,6 +19,7 @@
  */
 
 #include "rb-gtk3-private.h"
+#include <locale.h>
 
 static ID id_call;
 static VALUE cGdkAtom;
@@ -634,9 +635,11 @@ Init_gtk3(void)
 
     rbgtk3_cell_layout_init();
     rbgtk3_container_init();
+    rbgtk3_spin_button_init();
     rbgtk3_tree_model_init();
     rbgtk3_tree_view_init();
     rbgtk3_widget_init();
 
     rbgobj_boxed_not_copy_obj(GTK_TYPE_SELECTION_DATA);
+    setlocale(LC_NUMERIC, "C");
 }

data/lib/gtk3/deprecated.rb

@@ -711,14 +711,6 @@ module Gtk
     alias :update_policy= :set_update_policy
   end
 
-  module RC
-    extend GLib::Deprecatable
-    define_deprecated_const :Flags, "Gtk::RCFlags"
-    define_deprecated_flags :RCFlags
-    define_deprecated_const :TokenType, "Gtk::RCTokenType"
-    define_deprecated_enums :RCTokenType, 'TOKEN'
-  end
-
   class RecentAction
     extend GLib::Deprecatable
     define_deprecated_method_by_hash_args :initialize,

data/lib/gtk3/loader.rb

@@ -35,7 +35,7 @@ module Gtk
       arguments = [
         [$0] + @init_arguments,
       ]
-      succeeded, argv = init_check.invoke(:arguments => arguments)
+      succeeded, argv = init_check.invoke(arguments)
       @init_arguments.replace(argv[1..-1])
       raise InitError, "failed to initialize GTK+" unless succeeded
     end
@@ -401,12 +401,6 @@ module Gtk
       end
     end
 
-    def initialize_post(object)
-      super
-      return unless object.is_a?(GLib::Object)
-      self.class.reference_gobject(object, :sink => true)
-    end
-
     def setup_pending_constants
       @pending_constants = []
     end

data/lib/gtk3/tree-model.rb

@@ -105,6 +105,8 @@ module Gtk
       (@column_types ||= {})[index] ||= get_column_type_raw(index)
     end
 
+    alias_method :create_filter, :filter_new
+
     private
     def setup_iter(iter)
       iter.model = self

data/sample/gtk-demo/TODO

@@ -10,7 +10,7 @@ assistant.c             ok              ok
 builder.c               ok              ok
 button_box.c            ok              ok
 changedisplay.c         ok              no
-clipboard.c             ok              no
+clipboard.c             ok              ok
 colorsel.c              ok              ok
 combobox.c              no              no
 css_accordion.c         ok              ok
@@ -20,8 +20,8 @@ css_pixbufs.c           ok              ok
 css_shadows.c           ok              ok
 cursors.c               ok              ok
 dialog.c                ok              ok
-drawingarea.c           ok              no
-editable_cells.c        ok              no
+drawingarea.c           ok              ok
+editable_cells.c        ok              ok
 entry_buffer.c          ok              ok
 entry_completion.c      ok              ok
 event_axes.c            no              no
@@ -31,16 +31,16 @@ flowbox.c               no              no
 font_features.c         ok              ok
 foreigndrawing          no              no
 gestures.c              no              no
-glarea.c                no              no
+glarea.c                ok              ok
 headerbar.c             ok              ok
-hypertext.c             ok              no
-iconview.c              ok              no
+hypertext.c             ok              ok
+iconview.c              ok              ok
 iconview_edit.c         ok              ok
 images.c                ok              no
 infobar.c               ok              ok
 links.c                 ok              ok
-listbox.c               no              no
-list_store.c            ok              no
+listbox.c               ok              ok
+list_store.c            ok              ok
 markup.c                ok              ok
 menus.c                 ok              ok
 modelbutton.c           ok              ok
@@ -56,12 +56,12 @@ printing.c              ok              ok
 revealer.c              ok              ok
 rotated_text.c          ok              ok
 scale.c                 ok              ok
-search_entry.c          no              no
+search_entry.c          ok              ok
 search_entry2.c         ok              ok
 shortcuts.c             no              no
 sidebar.c               ok              ok
 sizegroup.c             ok              ok
-spinbutton.c            no              no
+spinbutton.c            ok              ok
 spinner.c               ok              ok
 stack.c                 ok              ok
 textmask.c              ok              ok

data/sample/gtk-demo/assistant.rb

@@ -8,21 +8,21 @@
  an operation into several simpler sequential steps, and to guide the user
  through these steps.
 =end
-module AssistantDemo
-  def self.run_demo(main_window)
-    assistant = Gtk::Assistant.new
-    assistant.screen = main_window.screen
+class AssistantDemo
+  def initialize(main_window)
+    @assistant = Gtk::Assistant.new
+    @assistant.screen = main_window.screen
 
-    create_page1(assistant)
-    create_page2(assistant)
-    create_page3(assistant)
-    progress_bar = create_page4(assistant)
+    create_page1
+    create_page2
+    create_page3
+    progress_bar = create_page4
 
-    assistant.signal_connect("cancel", &:destroy)
+    @assistant.signal_connect("cancel", &:destroy)
 
-    assistant.signal_connect("close", &:destroy)
+    @assistant.signal_connect("close", &:destroy)
 
-    assistant.signal_connect "apply" do |widget|
+    @assistant.signal_connect "apply" do |widget|
       GLib::Timeout.add(100) do
         fraction = progress_bar.fraction + 0.05
         if fraction < 1.0
@@ -34,7 +34,7 @@ module AssistantDemo
       end
     end
 
-    assistant.signal_connect "prepare" do |widget, _page|
+    @assistant.signal_connect "prepare" do |widget, _page|
       current_page = widget.current_page
       n_pages = widget.n_pages
 
@@ -42,16 +42,20 @@ module AssistantDemo
 
       widget.commit if current_page == 3
     end
+  end
 
-    if !assistant.visible?
-      assistant.show_all
+  def run
+    if !@assistant.visible?
+      @assistant.show_all
     else
-      assistant.destroy
+      @assistant.destroy
     end
-    assistant
+    @assistant
   end
 
-  def self.create_page1(assistant)
+  private
+
+  def create_page1
     box = Gtk::Box.new(:horizontal, 12)
     box.border_width = 12
 
@@ -64,23 +68,23 @@ module AssistantDemo
     box.pack_start(entry, :expand => true, :fill => true, :padding => 0)
 
     entry.signal_connect "changed" do |widget|
-      page_number = assistant.current_page
-      current_page = assistant.get_nth_page(page_number)
+      page_number = @assistant.current_page
+      current_page = @assistant.get_nth_page(page_number)
 
       if widget.text
-        assistant.set_page_complete(current_page, true)
+        @assistant.set_page_complete(current_page, true)
       else
-        assistant.set_page_complete(current_page, false)
+        @assistant.set_page_complete(current_page, false)
       end
     end
 
     box.show_all
-    assistant.append_page(box)
-    assistant.set_page_title(box, "Page 1")
-    assistant.set_page_type(box, :intro)
+    @assistant.append_page(box)
+    @assistant.set_page_title(box, "Page 1")
+    @assistant.set_page_type(box, :intro)
   end
 
-  def self.create_page2(assistant)
+  def create_page2
     box = Gtk::Box.new(:horizontal, 12)
     box.border_width = 12
 
@@ -91,34 +95,35 @@ LABEL
     box.pack_start(checkbutton, :expand => false, :fill => false, :padding => 0)
 
     box.show_all
-    assistant.append_page(box)
-    assistant.set_page_complete(box, true)
-    assistant.set_page_title(box, "Page 1")
+    @assistant.append_page(box)
+    @assistant.set_page_complete(box, true)
+    @assistant.set_page_title(box, "Page 1")
   end
 
-  def self.create_page3(assistant)
-    label = Gtk::Label.new("This is a confirmation page, press 'Apply' to apply changes")
+  def create_page3
+    message = "This is a confirmation page, press 'Apply' to apply changes"
+    label = Gtk::Label.new(message)
     label.show
 
-    assistant.append_page(label)
-    assistant.set_page_type(label, :confirm)
-    assistant.set_page_complete(label, true)
-    assistant.set_page_title(label, "Confirmation")
+    @assistant.append_page(label)
+    @assistant.set_page_type(label, :confirm)
+    @assistant.set_page_complete(label, true)
+    @assistant.set_page_title(label, "Confirmation")
   end
 
-  def self.create_page4(assistant)
+  def create_page4
     progress_bar = Gtk::ProgressBar.new
     progress_bar.halign = :center
     progress_bar.valign = :center
 
     progress_bar.show
-    assistant.append_page(progress_bar)
-    assistant.set_page_type(progress_bar, :progress)
-    assistant.set_page_title(progress_bar, "Applying changes")
+    @assistant.append_page(progress_bar)
+    @assistant.set_page_type(progress_bar, :progress)
+    @assistant.set_page_title(progress_bar, "Applying changes")
 
     # This prevents the assistant window from being
     # closed while we're "busy" applying changes.
-    assistant.set_page_complete(progress_bar, false)
+    @assistant.set_page_complete(progress_bar, false)
     progress_bar
   end
 end

data/sample/gtk-demo/builder.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2015 Ruby-GNOME2 Project Team
+# Copyright (c) 2015-2016 Ruby-GNOME2 Project Team
 # This program is licenced under the same licence as Ruby-GNOME2.
 #
 =begin
@@ -6,83 +6,104 @@
 
  Demonstrates an interface loaded from a XML description.
 =end
-module BuilderDemo
-  def self.run_demo(_main_window)
-    builder = Gtk::Builder.new(:resource => "/builder/demo.ui")
-    builder.connect_signals {}
+class BuilderDemo
+  def initialize(_main_window)
+    @builder = Gtk::Builder.new(:resource => "/builder/demo.ui")
+    @builder.connect_signals {}
 
-    window = builder["window1"]
-    toolbar = builder["toolbar1"]
+    @window = @builder["window1"]
+    toolbar = @builder["toolbar1"]
     toolbar.style_context.add_class("primary-toolbar")
 
+
+    add_actions
+    add_accelerators
+  end
+
+  def run
+    if !@window.visible?
+      @window.show_all
+    else
+      @window.destroy
+    end
+    @window
+  end
+
+  private
+
+  def add_actions
     actions = Gio::SimpleActionGroup.new
+    actions.add_action(quit_action)
+    actions.add_action(about_action)
+    actions.add_action(help_action)
+    @window.insert_action_group("win", actions)
+  end
 
+  def quit_action
     action = Gio::SimpleAction.new("quit")
     action.signal_connect "activate" do |_simple_action, _parameter|
-      window.destroy
+      @window.destroy
     end
-    actions.add_action(action)
+    action
+  end
 
+  def about_action
     action = Gio::SimpleAction.new("about")
-    actions.add_action(action)
     action.signal_connect "activate" do |_simple_action, _parameter|
-      about_dlg = builder["aboutdialog1"]
+      about_dlg = @builder["aboutdialog1"]
       about_dlg.run
       about_dlg.hide
     end
+    action
+  end
 
+  def help_action
     action = Gio::SimpleAction.new("help")
-    actions.add_action(action)
     action.signal_connect "activate" do |_simple_action, _parameter|
       puts "Help not available"
     end
+    action
+  end
 
-    window.insert_action_group("win", actions)
-
+  def add_accelerators
     accel_group = Gtk::AccelGroup.new
-    window.add_accel_group(accel_group)
 
-    builder["new_item"].add_accelerator("activate", accel_group,
-                                        Gdk::Keyval::KEY_n,
-                                        Gdk::ModifierType::CONTROL_MASK,
-                                        Gtk::AccelFlags::VISIBLE)
-    builder["open_item"].add_accelerator("activate", accel_group,
-                                         Gdk::Keyval::KEY_o,
-                                         Gdk::ModifierType::CONTROL_MASK,
-                                         Gtk::AccelFlags::VISIBLE)
-    builder["save_item"].add_accelerator("activate", accel_group,
-                                         Gdk::Keyval::KEY_s,
-                                         Gdk::ModifierType::CONTROL_MASK,
-                                         Gtk::AccelFlags::VISIBLE)
-    builder["quit_item"].add_accelerator("activate", accel_group,
-                                         Gdk::Keyval::KEY_q,
+    @builder["new_item"].add_accelerator("activate", accel_group,
+                                         Gdk::Keyval::KEY_n,
                                          Gdk::ModifierType::CONTROL_MASK,
                                          Gtk::AccelFlags::VISIBLE)
-    builder["copy_item"].add_accelerator("activate", accel_group,
-                                         Gdk::Keyval::KEY_c,
-                                         Gdk::ModifierType::CONTROL_MASK,
-                                         Gtk::AccelFlags::VISIBLE)
-    builder["cut_item"].add_accelerator("activate", accel_group,
-                                        Gdk::Keyval::KEY_x,
-                                        Gdk::ModifierType::CONTROL_MASK,
-                                        Gtk::AccelFlags::VISIBLE)
-    builder["paste_item"].add_accelerator("activate", accel_group,
-                                          Gdk::Keyval::KEY_v,
+    @builder["open_item"].add_accelerator("activate", accel_group,
+                                          Gdk::Keyval::KEY_o,
+                                          Gdk::ModifierType::CONTROL_MASK,
+                                          Gtk::AccelFlags::VISIBLE)
+    @builder["save_item"].add_accelerator("activate", accel_group,
+                                          Gdk::Keyval::KEY_s,
                                           Gdk::ModifierType::CONTROL_MASK,
                                           Gtk::AccelFlags::VISIBLE)
-    builder["help_item"].add_accelerator("activate", accel_group,
-                                         Gdk::Keyval::KEY_F1,
-                                         0,
+    @builder["quit_item"].add_accelerator("activate", accel_group,
+                                          Gdk::Keyval::KEY_q,
+                                          Gdk::ModifierType::CONTROL_MASK,
+                                          Gtk::AccelFlags::VISIBLE)
+    @builder["copy_item"].add_accelerator("activate", accel_group,
+                                          Gdk::Keyval::KEY_c,
+                                          Gdk::ModifierType::CONTROL_MASK,
+                                          Gtk::AccelFlags::VISIBLE)
+    @builder["cut_item"].add_accelerator("activate", accel_group,
+                                         Gdk::Keyval::KEY_x,
+                                         Gdk::ModifierType::CONTROL_MASK,
                                          Gtk::AccelFlags::VISIBLE)
-    builder["about_item"].add_accelerator("activate", accel_group,
-                                          Gdk::Keyval::KEY_F7,
+    @builder["paste_item"].add_accelerator("activate", accel_group,
+                                           Gdk::Keyval::KEY_v,
+                                           Gdk::ModifierType::CONTROL_MASK,
+                                           Gtk::AccelFlags::VISIBLE)
+    @builder["help_item"].add_accelerator("activate", accel_group,
+                                          Gdk::Keyval::KEY_F1,
                                           0,
                                           Gtk::AccelFlags::VISIBLE)
-    if !window.visible?
-      window.show_all
-    else
-      window.destroy
-    end
-    window
+    @builder["about_item"].add_accelerator("activate", accel_group,
+                                           Gdk::Keyval::KEY_F7,
+                                           0,
+                                           Gtk::AccelFlags::VISIBLE)
+    @window.add_accel_group(accel_group)
   end
 end