gtk3 2.0.2 → 2.0.3

data/ext/gtk3/rbgtk3conversions.h

@@ -185,8 +185,13 @@
 #define GTKBORDER2RVAL(o)                  (BOXED2RVAL(o, GTK_TYPE_BORDER))
 #define RVAL2GTKCSSSECTION(o)              ((GtkCssSection*)RVAL2BOXED(o, GTK_TYPE_CSS_SECTION))
 #define GTKCSSSECTION2RVAL(o)              (BOXED2RVAL(o, GTK_TYPE_CSS_SECTION))
-#define RVAL2GTKICONINFO(o)                ((GtkIconInfo*)RVAL2BOXED(o, GTK_TYPE_ICON_INFO))
-#define GTKICONINFO2RVAL(o)                (BOXED2RVAL(o, GTK_TYPE_ICON_INFO))
+#if GTK_CHECK_VERSION(3, 8, 0)
+#  define RVAL2GTKICONINFO(o)              (GTK_ICON_INFO(RVAL2GOBJ(o)))
+#  define GTKICONINFO2RVAL(o)              (GOBJ2RVAL(o))
+#else
+#  define RVAL2GTKICONINFO(o)              ((GtkIconInfo *)RVAL2BOXED(o, GTK_TYPE_ICON_INFO))
+#  define GTKICONINFO2RVAL(o)              (BOXED2RVAL(o, GTK_TYPE_ICON_INFO))
+#endif
 #define RVAL2GTKICONSET(o)                 ((GtkIconSet*)RVAL2BOXED(o, GTK_TYPE_ICON_SET))
 #define GTKICONSET2RVAL(o)                 (BOXED2RVAL(o, GTK_TYPE_ICON_SET))
 #define RVAL2GTKICONSOURCE(o)              ((GtkIconSource*)RVAL2BOXED(o, GTK_TYPE_ICON_SOURCE))
@@ -199,6 +204,8 @@
 #define GTKRECENTFILTERINFO2RVAL(o)        (BOXED2RVAL(o, GTK_TYPE_RECENT_FILTER_INFO))
 #define RVAL2GTKRECENTINFO(o)              ((GtkRecentInfo*)RVAL2BOXED(o, GTK_TYPE_RECENT_INFO))
 #define GTKRECENTINFO2RVAL(o)              (BOXED2RVAL(o, GTK_TYPE_RECENT_INFO))
+#define RVAL2GTKREQUISITION(o)             ((GtkRequisition *)RVAL2BOXED(o, GTK_TYPE_REQUISITION))
+#define GTKREQUISITION2RVAL(o)             (BOXED2RVAL(o, GTK_TYPE_REQUISITION))
 #define RVAL2GTKSELECTIONDATA(o)           ((GtkSelectionData*)RVAL2BOXED(o, GTK_TYPE_SELECTION_DATA))
 #define GTKSELECTIONDATA2RVAL(o)           (BOXED2RVAL(o, GTK_TYPE_SELECTION_DATA))
 #define RVAL2GTKSYMBOLICCOLOR(o)           ((GtkSymbolicColor*)RVAL2BOXED(o, GTK_TYPE_SYMBOLIC_COLOR))

data/ext/gtk3/rbgtk3private.h

@@ -48,12 +48,6 @@
 #  define G_VALUE_INIT { 0, { { 0 } } }
 #endif
 
-#if defined(HAVE_RB_CAIRO_H)
-#  define CAIRO_AVAILABLE 1
-#else
-#  define CAIRO_AVAILABLE 0
-#endif
-
 extern ID id_relative_callbacks;
 extern ID id_call;
 
@@ -157,7 +151,7 @@ G_GNUC_INTERNAL void Init_gtk_grid(VALUE mGtk);
 G_GNUC_INTERNAL void Init_gtk_handle_box(VALUE mGtk);
 G_GNUC_INTERNAL void Init_gtk_hsv(VALUE mGtk);
 G_GNUC_INTERNAL void Init_gtk_icon_factory(VALUE mGtk);
-G_GNUC_INTERNAL void Init_gtk_iconinfo(VALUE mGtk);
+G_GNUC_INTERNAL void Init_gtk_icon_info(VALUE mGtk);
 G_GNUC_INTERNAL void Init_gtk_icon_set(VALUE mGtk);
 G_GNUC_INTERNAL void Init_gtk_icon_size(VALUE mGtk);
 G_GNUC_INTERNAL void Init_gtk_icon_source(VALUE mGtk);

data/lib/gtk3/deprecated.rb

@@ -120,6 +120,7 @@ module Gtk
   class BindingSet
     extend GLib::Deprecatable
     define_deprecated_method :entry_clear, :entry_remove
+    define_deprecated_method :add_path, :raise => "Don't use this method."
   end
 
   class Box
@@ -194,6 +195,7 @@ module Gtk
     define_deprecated_method :editing_canceled, :warn => "Use '#{self}#stop_editing'." do |_self|
       _self.stop_editing(true)
     end
+    define_deprecated_method :get_size, :raise => "Use Gtk::Renderer#get_preferred_size."
   end
 
   class CellRendererAccel
@@ -206,6 +208,7 @@ module Gtk
     define_deprecated_method :cell_renderers, :warn => "Use 'Gtk::CellLayout#cells'." do |_self|
       _self.cells
     end
+    define_deprecated_method :get_size_of_row, :raise => "Use Gtk::Renderer#get_preferred_size."
   end
 
   class ColorSelectionDialog
@@ -970,6 +973,7 @@ module Gtk
     define_deprecated_method :requisition, :raise => "Don't use this method."
     define_deprecated_method :set_requisition, :warn => "Don't use this method."
     define_deprecated_method :saved_state, :raise => "Don't use this method."
+    define_deprecated_method :pointer, :raise => "Use 'Gdk::Window#get_device_position'."
 
     alias :__set_allocation__ :set_allocation
     private :__set_allocation__
@@ -998,4 +1002,3 @@ module Gtk
     define_deprecated_method :active_default, :activate_default
   end
 end
-

data/sample/gtk-demo/colorsel.rb

@@ -3,7 +3,7 @@
 #
 # $Id: colorsel.rb,v 1.4 2005/02/12 23:02:43 kzys Exp $
 =begin
-= Color Selector 
+= Color Selector
 
 Gtk::ColorSelection lets the user choose a color. Gtk::ColorSelectionDialog
 is a prebuilt dialog containing a Gtk::ColorSelection.
@@ -15,11 +15,11 @@ module Demo
     def initialize
       super('Color Selection')
 
-      @color = Gdk::Color.new(0, 0, 65535)
+      @color = Gdk::RGBA.new(0, 0, 1, 1)
 
       set_border_width(8)
-      
-      vbox = Gtk::VBox.new(false, 0)
+
+      vbox = Gtk::Box.new(:vertical, 0)
       vbox.set_border_width(8)
       add(vbox)
 
@@ -29,53 +29,51 @@ module Demo
       vbox.pack_start(@frame, :expand => true, :fill => true, :padding => 0)
 
       @da = Gtk::DrawingArea.new
-      
-      @da.signal_connect('expose_event') do |widget, event|
-	if widget.window
-	  style = widget.style
-
-	  widget.window.draw_rectangle(style.bg_gc(Gtk::STATE_NORMAL),
-				       true,
-				       event.area.x, event.area.y,
-				       event.area.width, event.area.height)
-	end
+
+      @da.signal_connect('draw') do |widget, event|
+        if widget.window
+          context = widget.style_context
+          background_color = context.get_background_color(:normal)
+          event.set_source_rgba(background_color.to_a)
+          event.paint
+        end
       end
 
       # set a minimum size
       @da.set_size_request(200, 200)
       # set the color
-      @da.modify_bg(Gtk::STATE_NORMAL, @color)
+      @da.override_background_color(:normal, @color)
 
       @frame.add(@da)
 
       alignment = Gtk::Alignment.new(1.0, 0.5, 0.0, 0.0)
 
-      button = Gtk::Button.new('_Change the above color', true)
+      button = Gtk::Button.new(:mnemonic => '_Change the above color')
       alignment.add(button)
 
       vbox.pack_start(alignment, :expand => false, :fill => false, :padding => 0)
 
       button.signal_connect('clicked') do
-	change_color_callback
+        change_color_callback
       end
     end
 
     def change_color_callback
-      dialog = Gtk::ColorSelectionDialog.new('Changing color')
+      dialog = Gtk::ColorSelectionDialog.new(:title => 'Changing color')
 
       dialog.set_transient_for(self)
 
-      colorsel = dialog.colorsel
+      colorsel = dialog.color_selection
 
-      colorsel.set_previous_color(@color)
-      colorsel.set_current_color(@color)
+      colorsel.set_previous_rgba(@color)
+      colorsel.set_current_rgba(@color)
       colorsel.set_has_palette(true)
 
       response = dialog.run
-      
-      if response == Gtk::Dialog::RESPONSE_OK
-	@color = colorsel.current_color
-	@da.modify_bg(Gtk::STATE_NORMAL, @color)
+
+      if response == Gtk::ResponseType::OK
+        @color = colorsel.current_rgba
+        @da.override_background_color(:normal, @color)
       end
 
       dialog.destroy

data/sample/gtk-demo/common.rb

@@ -14,7 +14,7 @@ module Demo
     %w(. /usr/share/gtk-3.0/demo /usr/local/share/gtk-3.0/demo/).each do |dirname|
       path = File.join(dirname, basename)
       if File.exist?(path)
-	return path
+        return path
       end
     end
 
@@ -25,7 +25,7 @@ module Demo
     def initialize(title = nil)
       super(:toplevel)
       if title
-	set_title("#{title} in Ruby/GTK")
+        set_title("#{title} in Ruby/GTK")
       end
 
       signal_connect("key_press_event") do |widget, event|
@@ -38,7 +38,7 @@ module Demo
       end
 
       signal_connect("delete_event") do |widget, event|
-	quit
+        quit
       end
     end
 
@@ -52,7 +52,7 @@ module Demo
 
     def initialize(title=nil)
       super
-      
+
       unless Gdk.cairo_available?
         add_cairo_require_label
         return
@@ -61,9 +61,9 @@ module Demo
       drawing_area = Gtk::DrawingArea.new
       add(drawing_area)
 
-      drawing_area.signal_connect("expose_event") do |widget, event|
+      drawing_area.signal_connect("draw") do |widget, event|
         cr = widget.window.create_cairo_context
-        cr.scale(*widget.window.size)
+        cr.scale(widget.window.width, widget.window.height)
         cr.set_line_width(0.04)
 
         cr.save do
@@ -71,11 +71,11 @@ module Demo
           cr.gdk_rectangle(Gdk::Rectangle.new(0, 0, 1, 1))
           cr.fill
         end
-        
+
         draw(cr)
       end
     end
-    
+
     def add_cairo_require_label
       message = "This sample requires GTK+ 2.8.0 or later and cairo support"
       add(Gtk::Label.new(message))

data/sample/gtk-demo/css_accordion.css

@@ -0,0 +1,53 @@
+@import url("reset.css");
+
+* {
+    transition-property: color, background-color, border-color, background-image, padding, border-width;
+    transition-duration: 1s;
+
+    font: Cantarell 20px;
+}
+
+GtkWindow {
+    background: linear-gradient(153deg, #151515, #151515 5px, transparent 5px) 0 0,
+                linear-gradient(333deg, #151515, #151515 5px, transparent 5px) 10px 5px,
+                linear-gradient(153deg, #222, #222 5px, transparent 5px) 0 5px,
+                linear-gradient(333deg, #222, #222 5px, transparent 5px) 10px 10px,
+                linear-gradient(90deg, #1b1b1b, #1b1b1b 10px, transparent 10px),
+                linear-gradient(#1d1d1d, #1d1d1d 25%, #1a1a1a 25%, #1a1a1a 50%, transparent 50%, transparent 75%, #242424 75%, #242424);
+    background-color: #131313;
+    background-size: 20px 20px;
+}
+
+.button {
+    color: black;
+    background-color: #bbb;
+    border-style: solid;
+    border-width: 2px 0 2px 2px;
+    border-color: #333;
+
+    padding: 12px 4px;
+}
+
+.button:first-child {
+    border-radius: 5px 0 0 5px;
+}
+
+.button:last-child {
+    border-radius: 0 5px 5px 0;
+    border-width: 2px;
+}
+
+.button:hover {
+    padding: 12px 48px;
+    background-color: #4870bc;
+}
+
+.button *:hover {
+    color: white;
+}
+
+.button:hover:active,
+.button:active {
+    background-color: #993401;
+}
+

data/sample/gtk-demo/css_accordion.rb

@@ -0,0 +1,75 @@
+#!/usr/bin/env ruby
+#
+# This sample code is a port of gtk3/demos/gtk-demo/css_accordion.c. The
+# CSS files used in this sample code are copied from gtk3/demos/gtk-demo.
+# They are licensed under the terms of the GNU Lesser General Public
+# License, version 2.1 or (at your option) later.
+#
+# Copyright (C) 2013  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
+=begin
+= CSS Theming/CSS Accordion
+
+A simple accordion demo written using CSS transitions and multiple backgrounds
+=end
+
+require "common"
+
+module Demo
+  class CssAccordion < BasicWindow
+    def initialize
+      super("CSS Accordion")
+      set_default_size(600, 300)
+
+      container = Gtk::Box.new(:horizontal, 0)
+      container.set_halign(:center)
+      container.set_valign(:center)
+      add(container)
+
+      child = Gtk::Button.new(:label => "This")
+      container.add(child)
+
+      child = Gtk::Button.new(:label => "Is")
+      container.add(child)
+
+      child = Gtk::Button.new(:label => "A")
+      container.add(child)
+
+      child = Gtk::Button.new(:label => "CSS")
+      container.add(child)
+
+      child = Gtk::Button.new(:label => "Accordion")
+      container.add(child)
+
+      child = Gtk::Button.new(:label => ":-)")
+      container.add(child)
+
+      provider = Gtk::CssProvider.new
+      provider.load(:data => File.read("css_accordion.css"))
+
+      apply_css(self, provider)
+    end
+
+    def apply_css(widget, provider)
+      widget.style_context.add_provider(provider, GLib::MAXUINT)
+      if widget.is_a?(Gtk::Container)
+        widget.each_forall do |child|
+          apply_css(child, provider)
+        end
+      end
+    end
+  end
+end

data/sample/gtk-demo/main.rb

@@ -2,7 +2,7 @@
 =begin
   main.rb - Main class of gtk-demo.
 
-  Copyright (c) 2003-2006 Ruby-GNOME2 Project Team
+  Copyright (c) 2003-2013 Ruby-GNOME2 Project Team
   This program is licenced under the same licence as Ruby-GNOME2.
 
   $Id: main.rb,v 1.20 2007/07/09 13:21:54 ggc Exp $
@@ -27,7 +27,7 @@ module Demo
 
       set_title('Ruby/GTK+ Code Demos')
       signal_connect('destroy') do
-	Gtk.main_quit
+        Gtk.main_quit
       end
 
       signal_connect("key_press_event") do |widget, event|
@@ -52,10 +52,10 @@ module Demo
       hbox.pack_start(notebook, :expand => true, :fill => true, :padding => 0)
 
       notebook.append_page(create_text(@info_buffer, false),
-			   Gtk::Label.new('_Info', true))
+                           Gtk::Label.new('_Info', true))
 
       notebook.append_page(create_text(@source_buffer, true),
-			   Gtk::Label.new('_Source', true))
+                           Gtk::Label.new('_Source', true))
 
       @info_buffer.create_tag('title',
                              {'font' => 'Sans 18'})
@@ -66,9 +66,9 @@ module Demo
                                {'foreground' => 'ForestGreen'})
       @source_buffer.create_tag('string',
                                {
-				  'foreground' => 'RosyBrown',
+                                  'foreground' => 'RosyBrown',
                                   'weight' => Pango::FontDescription::WEIGHT_BOLD
-				})
+                                })
       @source_buffer.create_tag('reserved',
                                {'foreground' => 'purple'})
     end
@@ -96,7 +96,7 @@ module Demo
       end
 
       if not klass
-          raise "File not found: #{path}. This script should be run from its directory."
+        raise "File not found: #{path}."
       end
 
       return title, klass.intern, depend
@@ -179,8 +179,8 @@ module Demo
       tree_view.append_column(column)
 
       selection.signal_connect('changed') do |selection|
-	iter = selection.selected
-	load_file(iter.get_value(FILENAME_COLUMN)) if iter
+        iter = selection.selected
+        load_file(iter.get_value(FILENAME_COLUMN)) if iter
       end
       tree_view.signal_connect('row_activated') do |tree_view, path, column|
         row_activated_cb(tree_view.model, path)
@@ -192,13 +192,13 @@ module Demo
 
     def append_children(model, source, parent = nil)
       source.each do |title, filename, klass, children|
-	iter = model.append(parent)
+        iter = model.append(parent)
 
-	[title, filename, klass].each_with_index do |value, i|
-	  if value
-	    iter.set_value(i, value)
-	  end
-	end
+        [title, filename, klass].each_with_index do |value, i|
+          if value
+            iter.set_value(i, value)
+          end
+        end
         iter.set_value(ITALIC_COLUMN, false)
 
         if children
@@ -214,21 +214,21 @@ module Demo
       lib = iter.get_value(FILENAME_COLUMN)
       if lib
         require(lib)
- 
+
         klass = Demo.const_get(iter.get_value(CLASS_COLUMN))
         window = klass.new
         window.signal_connect('destroy') do
           iter.set_value(ITALIC_COLUMN, false)
         end
         window.show_all
-	@window = window
+        @window = window
       end
     end
 
     def create_text(buffer, is_source)
       scrolled_window = Gtk::ScrolledWindow.new
       scrolled_window.set_policy(:automatic,
-				 :automatic)
+                                 :automatic)
       scrolled_window.set_shadow_type(:in)
 
       text_view = Gtk::TextView.new
@@ -240,35 +240,35 @@ module Demo
       scrolled_window.add(text_view)
 
       if is_source
-	font_desc = Pango::FontDescription.new('Monospace 12')
-	text_view.override_font(font_desc)
+        font_desc = Pango::FontDescription.new('Monospace 12')
+        text_view.override_font(font_desc)
 
-	text_view.set_wrap_mode(:none)
+        text_view.set_wrap_mode(:none)
       else
-	text_view.set_wrap_mode(:word)
-	text_view.set_pixels_above_lines(2)
-	text_view.set_pixels_below_lines(2)
+        text_view.set_wrap_mode(:word)
+        text_view.set_pixels_above_lines(2)
+        text_view.set_pixels_below_lines(2)
       end
 
       return scrolled_window
     end
 
     def fontify(start_iter = @source_buffer.start_iter,
-		end_iter = @source_buffer.end_iter)
+                end_iter = @source_buffer.end_iter)
       str = @source_buffer.get_text(start_iter, end_iter, true)
 
       tokenizer = RubyTokonizer.new
       tokenizer.tokenize(str, start_iter.offset) do |tag, start, last|
-	@source_buffer.apply_tag(tag.to_s,
-				 @source_buffer.get_iter_at(:offset => start),
-				 @source_buffer.get_iter_at(:offset => last))
+        @source_buffer.apply_tag(tag.to_s,
+                                 @source_buffer.get_iter_at(:offset => start),
+                                 @source_buffer.get_iter_at(:offset => last))
       end
     end
 
 
     def load_file(filename)
       if filename == @current_file
-	return
+        return
       end
 
       @info_buffer.delete(*@info_buffer.bounds)
@@ -276,43 +276,43 @@ module Demo
       @source_buffer.delete(*@source_buffer.bounds)
 
       file = begin
-	       File.open(filename)
-	     rescue
-	       $stderr.puts "Cannot open: #{$!}" if $DEBUG
-	       return
-	     end
+               File.open(filename)
+             rescue
+               $stderr.puts "Cannot open: #{$!}" if $DEBUG
+               return
+             end
       start = @info_buffer.get_iter_at(:offset => 0)
       state = :before_header
 
       file.each do |line|
-	case state
-	when :before_header
-	  if line =~ /^=begin$/
-	    state = :in_header
-	  end
-	when :in_header
-	  if line =~ /^=end$/
-	    state = :body
-	    start = @source_buffer.get_iter_at(:offset => 0)
-	  elsif line =~ /^=\s+(.*)$/
-	    title = $1
+        case state
+        when :before_header
+          if line =~ /^=begin$/
+            state = :in_header
+          end
+        when :in_header
+          if line =~ /^=end$/
+            state = :body
+            start = @source_buffer.get_iter_at(:offset => 0)
+          elsif line =~ /^=\s+(.*)$/
+            title = $1
             title.gsub!(/\s*\(.*\)$/, '') # Delete depend field
 
-	    last = start
+            last = start
 
-	    @info_buffer.insert(last, title)
-	    start = last.clone
+            @info_buffer.insert(last, title)
+            start = last.clone
 
-	    start.backward_chars(title.length)
-	    @info_buffer.apply_tag('title', start, last)
+            start.backward_chars(title.length)
+            @info_buffer.apply_tag('title', start, last)
 
-	    start = last
-	  else
-	    @info_buffer.insert(start, line)
-	  end
-	when :body  # Reading program body
-	  @source_buffer.insert(start, line)
-	end
+            start = last
+          else
+            @info_buffer.insert(start, line)
+          end
+        when :body  # Reading program body
+          @source_buffer.insert(start, line)
+        end
       end
 
       fontify
@@ -327,30 +327,30 @@ module Demo
 
     def tokenize(str, index = 0)
       until str.empty?
-	tag = nil
-
-	case str
-	when /".+?"/, /'.+?'/
-	  tag = :string
-	when /#.*$/
-	  tag = :comment
-	when RESERVED_WORDS_PATTERN
-	  tag = :reserved
-	when /[A-Z][A-Za-z0-9_]+/
-	  tag = :const
-	end
-
-	if tag
-	  tokenize($~.pre_match, index) do |*args|
+        tag = nil
+
+        case str
+        when /".+?"/, /'.+?'/
+          tag = :string
+        when /#.*$/
+          tag = :comment
+        when RESERVED_WORDS_PATTERN
+          tag = :reserved
+        when /[A-Z][A-Za-z0-9_]+/
+          tag = :const
+        end
+
+        if tag
+          tokenize($~.pre_match, index) do |*args|
             yield(*args)
-	  end
-	  yield(tag, index + $~.begin(0), index + $~.end(0))
-	  index += (str.length - $~.post_match.length)
-	  str = $~.post_match
-	else
-	  index += str.length
-	  str = ''
-	end
+          end
+          yield(tag, index + $~.begin(0), index + $~.end(0))
+          index += (str.length - $~.post_match.length)
+          str = $~.post_match
+        else
+          index += str.length
+          str = ''
+        end
       end
     end
   end
@@ -367,9 +367,9 @@ if target
       window.show_all
 
       class << window
-	def quit
-	  Gtk.main_quit
-	end
+        def quit
+          Gtk.main_quit
+        end
       end
 
       break