gtk3 2.2.5-x64-mingw32 → 3.0.0-x64-mingw32

data/sample/misc/checkbutton.rb

@@ -2,10 +2,8 @@
 =begin
   checkbutton.rb - Ruby/GTK2 sample script.
 
-  Copyright (c) 2002-2006 Ruby-GNOME2 Project Team 
+  Copyright (c) 2002-2015 Ruby-GNOME2 Project Team 
   This program is licenced under the same licence as Ruby-GNOME2.
-
-  $Id: checkbutton.rb,v 1.10 2006/06/17 13:18:12 mutoh Exp $
 =end
 
 require "gtk3"
@@ -24,7 +22,8 @@ box2.border_width = 10
 box1.pack_start(box2)
 
 button1 = Gtk::CheckButton.new("_button1")
-button2 = Gtk::CheckButton.new("_button2", false)
+button1.set_use_underline(true)
+button2 = Gtk::CheckButton.new("_button2")
 button3 = Gtk::CheckButton.new(Gtk::Stock::QUIT)
 box2.add(button1)
 box2.add(button2)

data/sample/misc/colorselection.rb

@@ -1,22 +1,23 @@
 =begin
   colorselection.rb - Gtk::ColorSelection sample script.
 
-  Copyright (C) 2005,2006  Masao Mutoh
+  Copyright (C) 2005-2015  Masao Mutoh
   This program is licenced under the same licence as Ruby-GNOME2.
-
-  $Id: colorselection.rb,v 1.3 2006/06/17 13:18:12 mutoh Exp $
 =end
 
 require "gtk3"
 
-a = Gtk::ColorSelection.new
-a.has_palette = true
-a.signal_connect("color_changed") do |w|
-  unless w.adjusting?
-    p w.current_rgba.to_s
+color_selection = Gtk::ColorSelection.new
+color_selection.has_palette = true
+color_selection.signal_connect("color_changed") do |widget|
+  unless widget.adjusting?
+    p widget.current_rgba.to_s
   end
 end
 
-Gtk::Window.new.add(a).show_all.signal_connect("destroy") {Gtk.main_quit}
+window = Gtk::Window.new
+window.add(color_selection)
+window.show_all
+window.signal_connect("destroy") {Gtk.main_quit}
 
 Gtk.main

data/sample/misc/{combo_check.rb → combo-check.rb}

@@ -2,10 +2,8 @@
 =begin
   combo_check.rb - Ruby/GTK sample script.
 
-  Copyright (c) 2002-2006 Ruby-GNOME2 Project Team
+  Copyright (c) 2002-2015 Ruby-GNOME2 Project Team
   This program is licenced under the same licence as Ruby-GNOME2.
-
-  $Id: combo_check.rb,v 1.9 2006/06/17 13:18:12 mutoh Exp $
 =end
 
 require "gtk3"

data/sample/misc/combobox-from-cellrender.rb

@@ -0,0 +1,48 @@
+#!/usr/bin/env ruby
+=begin
+  combobox_from_cellrender.rb - Ruby/GTK sample script
+  Copyright (c) 2015 Ruby-GNOME2 Project Team
+  This program is licenced under the same licence as Ruby-GNOME2.
+=end
+
+require "gtk3"
+
+window = Gtk::Window.new "Combobox with CellRender"
+
+lstore = Gtk::ListStore.new(TrueClass, String)
+
+(1..5).each do |i|
+  lstore.append.set_values([false, "item#{i}"])
+end
+
+combobox = Gtk::ComboBox.new(:model => lstore, :entry => true)
+
+toggle = Gtk::CellRendererToggle.new
+
+toggle.signal_connect "toggled" do |widget, path|
+  puts widget.class
+  puts path.class
+end
+
+combobox.pack_start(toggle, true)
+combobox.add_attribute(toggle, "active", 0)
+combobox.set_entry_text_column(1)
+
+window.add combobox
+
+combobox.signal_connect("changed") do |widget|
+  list = widget.model
+  list.each do |_model, _path, iter|
+    iter[0] = false
+  end
+  iter = widget.active_iter
+  puts iter.inspect
+  puts "#{iter[0]} #{iter[1]}"
+
+  iter[0] = true
+end
+
+window.signal_connect("destroy") { Gtk.main_quit }
+
+window.show_all
+Gtk.main

data/sample/misc/combobox.rb

@@ -2,17 +2,14 @@
 =begin
   combobox.rb - Ruby/GTK sample script.
 
-  Copyright (c) 2004-2006 Ruby-GNOME2 Project Team
+  Copyright (c) 2004-2015 Ruby-GNOME2 Project Team
   This program is licenced under the same licence as Ruby-GNOME2.
-
-  $Id: combobox.rb,v 1.3 2006/06/17 13:18:12 mutoh Exp $
 =end
 
 require "gtk3"
 
-if str = Gtk.check_version(3, 10, 7)
+unless Gtk::Version.or_later?(3, 10, 7)
   puts "This sample requires GTK+ 3.10.7 or later"
-  puts str
   exit
 end
 
@@ -40,7 +37,7 @@ model = Gtk::ListStore.new(Gdk::Pixbuf, String)
  [Gtk::Stock::CANCEL, "cancel"],
  [Gtk::Stock::OK, "ok"]].each do |stock, name|
   iter = model.append
-  iter[0] = window.render_icon_pixbuf(stock, Gtk::IconSize::IconSize::MENU)
+  iter[0] = window.render_icon_pixbuf(stock, Gtk::IconSize::MENU)
   iter[1] = name
 end
 
@@ -49,12 +46,12 @@ combo2 = Gtk::ComboBox.new(:model => model)
 # column 1
 renderer = Gtk::CellRendererPixbuf.new
 combo2.pack_start(renderer, false)
-combo2.set_attributes(renderer, :pixbuf => 0)
+combo2.add_attribute(renderer, "pixbuf", 0)
 
 # column 2
 renderer = Gtk::CellRendererText.new
 combo2.pack_start(renderer, true)
-combo2.set_attributes(renderer, :text => 1)
+combo2.add_attribute(renderer, "text", 1)
 
 combo2.active = 2
 
@@ -79,7 +76,10 @@ end
 
 # Show main window
 vbox = Gtk::Box.new(:vertical)
-vbox.add(combo1).add(combo2).add(combo3)
-window.add(vbox).show_all
+vbox.add(combo1)
+vbox.add(combo2)
+vbox.add(combo3)
+window.add(vbox)
+window.show_all
 
 Gtk.main

data/sample/misc/cursor.rb

@@ -2,9 +2,8 @@
   cursor.rb - Gdk::Cursor sample script.
 
   Copyright (C) 2001-2006 Masao Mutoh
+  Copyright (c) 2002-2015 Ruby-GNOME2 Project Team
   This program is licenced under the same licence as Ruby-GNOME2.
-
-  $Id: cursor.rb,v 1.7 2006/06/17 13:18:12 mutoh Exp $
 =end
 
 require "gtk3"
@@ -16,8 +15,8 @@ window.realize
 button = Gtk::Button.new(:label => "Click!")
 button.use_underline = false
 
-cursors = Gdk::Cursor::Type.values - [Gdk::Cursor::Type::CURSOR_IS_PIXMAP]
-cursors -= [Gdk::Cursor::Type::LAST_CURSOR]
+cursors = Gdk::CursorType.values - [Gdk::CursorType::CURSOR_IS_PIXMAP]
+cursors -= [Gdk::CursorType::LAST_CURSOR]
 
 cnt = 0
 button.signal_connect('clicked') do
@@ -29,6 +28,7 @@ p cursor.inspect
   cnt = 0 if cnt == cursors.size
 end
 window.add(button)
-window.set_default_size(400,100).show_all
+window.set_default_size(400,100)
+window.show_all
 
 Gtk.main

data/sample/misc/dialog.rb

@@ -4,8 +4,6 @@
 
   Copyright (c) 2002-2006 Ruby-GNOME2 Project Team
   This program is licenced under the same licence as Ruby-GNOME2.
-
-  $Id: dialog.rb,v 1.6 2006/06/17 13:18:12 mutoh Exp $
 =end
 
 require "gtk3"
@@ -39,6 +37,7 @@ button.signal_connect("clicked") do
   dialog.show_all
 end
 
-window.add(button).show_all.signal_connect("destroy") {Gtk.main_quit}
-
+window.add(button)
+window.signal_connect("destroy") {Gtk.main_quit}
+window.show_all
 Gtk.main

data/sample/misc/dialog2.rb

@@ -2,10 +2,8 @@
 =begin
   dialog2.rb - Ruby/GTK2 sample script.
 
-  Copyright (c) 2002-2006 Ruby-GNOME2 Project Team
+  Copyright (c) 2002-2015 Ruby-GNOME2 Project Team
   This program is licenced under the same licence as Ruby-GNOME2.
-
-  $Id: dialog2.rb,v 1.7 2006/06/17 13:18:12 mutoh Exp $
 =end
 
 require "gtk3"
@@ -15,7 +13,7 @@ button = Gtk::Button.new(:label => "Create Dialog")
 button.signal_connect("clicked") do
   dialog = Gtk::Dialog.new(:title =>"Gtk::Dialog Sample 2",
                            :parent => window,
-                           :flags => Gtk::Dialog::Flags::MODAL,
+                           :flags => :modal,
                            :buttons => [[Gtk::Stock::OK, Gtk::ResponseType::OK],
                            [Gtk::Stock::CANCEL, Gtk::ResponseType::CANCEL]])
   dialog.child.add(Gtk::Label.new("Gtk::Dialog Sample 2"))
@@ -31,6 +29,7 @@ button.signal_connect("clicked") do
   dialog.destroy
 end
 
-window.add(button).show_all.signal_connect("destroy") {Gtk.main_quit}
-
+window.add(button)
+window.signal_connect("destroy") {Gtk.main_quit}
+window.show_all
 Gtk.main

data/sample/misc/dnd.rb

@@ -1,11 +1,9 @@
 =begin
   dnd.rb - Drag and Drop sample script.
 
-  Copyright (C) 2002-2006 Masao Mutoh
+  Copyright (C) 2002-2015 Masao Mutoh
+  Copyright (c) 2002-2015 Ruby-GNOME2 Project Team
   This program is licenced under the same licence as Ruby-GNOME2.
-
-  $Date: 2006/06/17 13:18:12 $
-  $Id: dnd.rb,v 1.9 2006/06/17 13:18:12 mutoh Exp $
 =end
 
 require "gtk3"
@@ -16,16 +14,17 @@ class SrcWindow < Gtk::Window
     @label = Gtk::Label.new("Drag here!")
     add(@label)
     set_default_size(100, 100)
-    drag_source_set(Gdk::Window::ModifierType::BUTTON1_MASK |
-                    Gdk::Window::ModifierType::BUTTON2_MASK,
-                    [["test", Gtk::Drag::TargetFlags::SAME_APP, 12345]],
-                    Gdk::DragContext::Action::COPY |
-                    Gdk::DragContext::Action::MOVE)
-    signal_connect("drag-data-get") do |widget, context, selection_data, info, time|
-#      selection_data.set("text/uri-list", 8, "hoge.txt")
-      selection_data.set(Gdk::Selection::TYPE_STRING, "hoge.txt")
+    drag_source_set(Gdk::ModifierType::BUTTON1_MASK |
+                    Gdk::ModifierType::BUTTON2_MASK,
+                    [["test", Gtk::TargetFlags::SAME_APP, 12_345]],
+                    Gdk::DragAction::COPY |
+                    Gdk::DragAction::MOVE)
+    signal_connect("drag-data-get") do |_widget, _context, selection_data, _info, _time|
+      selection_data.set(Gdk::Selection::TYPE_STRING, "this is a test")
+      puts "drag-data-get signal:"
+      puts selection_data.text
     end
- end
+  end
 end
 
 class DestWindow < Gtk::Window
@@ -35,21 +34,26 @@ class DestWindow < Gtk::Window
     @label = Gtk::Label.new("Drop here!")
     add(@label)
     set_default_size(100, 100)
-    drag_dest_set(Gtk::Drag::DestDefaults::MOTION |
-                  Gtk::Drag::DestDefaults::HIGHLIGHT,
-                  [["test", :same_app, 12345]],
-                  Gdk::DragContext::Action::COPY |
-                  Gdk::DragContext::Action::MOVE)
+    drag_dest_set(Gtk::DestDefaults::MOTION |
+                  Gtk::DestDefaults::HIGHLIGHT,
+                  [["test", :same_app, 12_345]],
+                  Gdk::DragAction::COPY |
+                  Gdk::DragAction::MOVE)
 
-    signal_connect("drag-data-received") do |widget, context, x, y, selection_data, info, time|
+    signal_connect("drag-data-received") do |_widget, context, _x, _y, selection_data, _info, _time|
       context.targets.each do |target|
         if target.name == "test" ||
            selection_data.type == Gdk::Selection::TYPE_STRING
-          puts selection_data.data
+          data_len = selection_data.data[1]
+          puts "drag-data-received signal:"
+          puts selection_data.data[0].pack("C#{data_len}")
+          puts selection_data.text
+        else
+          next
         end
       end
     end
-    signal_connect("drag-drop") do |widget, context, x, y, time|
+    signal_connect("drag-drop") do |widget, context, _x, _y, time|
       widget.drag_get_data(context, context.targets[0], time)
     end
   end
@@ -58,7 +62,7 @@ end
 win1 = SrcWindow.new
 win2 = DestWindow.new
 
-win1.show_all.signal_connect("destroy") {Gtk.main_quit}
-win2.show_all.signal_connect("destroy") {Gtk.main_quit}
+win1.show_all.signal_connect("destroy") { Gtk.main_quit }
+win2.show_all.signal_connect("destroy") { Gtk.main_quit }
 
 Gtk.main

data/sample/misc/dndtreeview.rb

@@ -1,36 +1,34 @@
 =begin
   dndtreeview.rb - Drag and Drop sample script.
 
-  Copyright (C) 2003-2006 Masao Mutoh
+  Copyright (C) 2003-2015 Masao Mutoh
+  Copyright (c) 2003-2015 Ruby-GNOME2 Project Team
   This program is licenced under the same licence as Ruby-GNOME2.
-
-  $Date: 2006/06/17 13:18:12 $
-  $Id: dndtreeview.rb,v 1.3 2006/06/17 13:18:12 mutoh Exp $
 =end
 
-require 'gtk3'
+require "gtk3"
 
 class TestWindow < Gtk::Window
   attr_reader :list
 
   TARGET_TABLE = [["GTK_TREE_MODEL_ROW", 0, 0]]
 
-  def initialize()
+  def initialize
     super("Drag and Drop Gtk::TreeView")
 
-    set_default_size(300,128)
+    set_default_size(300, 128)
     signal_connect("destroy") { Gtk.main_quit }
 
     data = [["Hello", "KON-NI-CHIWA"],
-      ["Goodbye", "SAYO-NARA"],
-      ["Good morning", "OHA-YO-GOZAI-MASU"],
-      ["Good evening", "KON-BAN-WA"]]
+            ["Goodbye", "SAYO-NARA"],
+            ["Good morning", "OHA-YO-GOZAI-MASU"],
+            ["Good evening", "KON-BAN-WA"]]
 
     model = Gtk::ListStore.new(String, String)
     view = Gtk::TreeView.new(model)
     renderer = Gtk::CellRendererText.new
-    col1 = Gtk::TreeViewColumn.new("Data", renderer, {:text => 0})
-    col2 = Gtk::TreeViewColumn.new("Data", renderer, {:text => 1})
+    col1 = Gtk::TreeViewColumn.new("Data", renderer, { :text => 0 })
+    col2 = Gtk::TreeViewColumn.new("Data", renderer, { :text => 1 })
     view.append_column(col1)
     view.append_column(col2)
 
@@ -40,17 +38,17 @@ class TestWindow < Gtk::Window
       iter.set_value(1, v2)
     end
 
-    view.enable_model_drag_source(Gdk::Window::ModifierType::BUTTON1_MASK,
-                                  TARGET_TABLE, 
-                                  Gdk::DragContext::Action::COPY|Gdk::DragContext::Action::MOVE)
+    view.enable_model_drag_source(Gdk::ModifierType::BUTTON1_MASK,
+                                  TARGET_TABLE,
+                                  Gdk::DragAction::COPY | Gdk::DragAction::MOVE)
     view.enable_model_drag_dest(TARGET_TABLE,
-                                 Gdk::DragContext::Action::COPY|Gdk::DragContext::Action::MOVE) 
+                                 Gdk::DragAction::COPY | Gdk::DragAction::MOVE)
 
     add(view)
   end
 end
 
-win = TestWindow.new.show_all
+win = TestWindow.new
+win.show_all
 
 Gtk.main
-

data/sample/misc/drag-move.rb

@@ -1,12 +1,9 @@
 =begin
   drag-move.rb - Move widget by drag sample script.
 
-  Copyright (C) 2011-2014 Ruby-GNOME2 Project Team
+  Copyright (C) 2011-2015 Ruby-GNOME2 Project Team
   Copyright (C) 2006 Kouhei Sutou
   This program is licenced under the same licence as Ruby-GNOME2.
-
-  $Date: 2006/06/17 13:18:12 $
-  $Id: drag-move.rb,v 1.2 2006/06/17 13:18:12 mutoh Exp $
 =end
 
 require "gtk3"
@@ -43,7 +40,7 @@ class DraggableWidget < Gtk::EventBox
   def set_button_press_event
     signal_connect("button-press-event") do |widget, event|
       if event.button == @drag_button
-        Gtk.grab_add(widget)
+        widget.grab_add
         x, y, w, h = widget.allocation.to_a
         drag_start(x, y, event.x_root, event.y_root)
       else
@@ -65,7 +62,7 @@ class DraggableWidget < Gtk::EventBox
   def set_button_release_event
     signal_connect("button-release-event") do |widget, event|
       if event.button == @drag_button
-        Gtk.grab_remove(widget)
+        widget.grab_remove
         drag_end
       else
         false

data/sample/misc/drawing.rb

@@ -1,109 +1,97 @@
 =begin
-  drawing.rb - Gtk::Drawing sample script.
-
-  Copyright (c) 2002-2006 Ruby-GNOME2 Project Team
+  drawing.rb - Ruby/GTK version of gtk+/examples/drawing.c.
+  https://git.gnome.org/browse/gtk+/tree/examples/drawing.c?h=gtk-3-16
+  Copyright (c) 2015 Ruby-GNOME2 Project Team
   This program is licenced under the same licence as Ruby-GNOME2.
-
-  $Id: drawing.rb,v 1.7 2006/06/17 13:18:12 mutoh Exp $
 =end
 
-require 'gtk3'
+require "gtk3"
 
-class Canvas < Gtk::DrawingArea
-  def initialize
-    super
-    signal_connect("draw") do |w, e|
-      expose_event(w, e)
-    end
-    signal_connect("configure_event") do |w, e|
-      configure_event(w, e)
-    end
-    @buffer = nil
-    @bgc = nil
-  end
+surface = nil
 
-  def expose_event(w, e)
-    unless @buffer.nil?
-      rec = e.area
-      w.window.draw_drawable(@bgc,
-                             @buffer,
-                             rec.x, rec.y,
-                             rec.x, rec.y,
-                             rec.width, rec.height)
-    end
-    false
+def clear_surface(surface)
+  cr = Cairo::Context.new(surface)
+  cr.set_source_rgb(1, 1, 1)
+  cr.paint
+  cr.destroy
+end
+
+def draw_brush(widget, surface, x, y)
+  cr = Cairo::Context.new(surface)
+  cr.rectangle(x - 3, y - 3, 6, 6)
+  cr.fill
+  cr.destroy
+  widget.queue_draw_area(x - 3, y - 3, 6, 6)
+end
+
+myapp = Gtk::Application.new "org.gtk.example", :flags_none 
+
+myapp.signal_connect "activate" do |app|
+  win = Gtk::ApplicationWindow.new app
+  win.set_title "Drawing Area"
+
+  win.signal_connect "delete-event" do
+    win.destroy
   end
 
-  def clear(b = @buffer)
-    return if b.nil?
+  win.set_border_width 8
 
-    g = b.size
-    @bgc = self.style.bg_gc(self.state) if @bgc.nil?
-    if (g[0] > 0 && g[1] > 0)
-      b.draw_rectangle(@bgc, true, 0, 0, g[0], g[1])
-    end
+  frame = Gtk::Frame.new
+  frame.shadow_type = Gtk::ShadowType::IN
+  win.add frame
+
+  drawing_area = Gtk::DrawingArea.new
+  # Set a minimum size
+  drawing_area.set_size_request 100, 100
+  frame.add drawing_area
+
+  # Signals used to handle the backing surface
+  drawing_area.signal_connect "draw" do |_da, cr|
+    cr.set_source(surface, 0, 0)
+    cr.paint
+    false
   end
 
-  def configure_event(w, e)
-    g = w.window.geometry
-    if (g[2] > 0 && g[3] > 0)
-      b = Gdk::Pixmap::new(w.window, g[2], g[3], -1)
-      clear(b)
-      if not @buffer.nil?
-        g = @buffer.size
-        b.draw_drawable(@bgc,
-                        @buffer,
-                        0, 0,
-                        0, 0,
-                        g[0], g[1])
-      end
-      @buffer = b
-    end
+  drawing_area.signal_connect "configure-event" do |da, _ev|
+    surface.destroy if surface
+    surface = win.window.create_similar_surface(Cairo::CONTENT_COLOR,
+                                                da.allocated_width,
+                                                da.allocated_height)
+    # Initialize the surface to white
+    clear_surface(surface)
+
+    # the configure event have been handled, no need for further
+    # processing
     true
   end
-end
 
-class A < Canvas
-  def initialize
-    super
-    signal_connect("button_press_event") do |w, e|
-      pressed(w, e)
+  # Event signals
+  drawing_area.signal_connect "motion-notify-event" do |da, ev|
+    return false unless surface
+
+    if ((ev.state & Gdk::EventMask::BUTTON_PRESS_MASK.to_i) != 0)
+      draw_brush(da, surface, ev.x, ev.y)
     end
-    set_events(Gdk::Event::BUTTON_PRESS_MASK)
   end
 
-  def pressed(widget, ev)
-    if not @last.nil?
-      @buffer.draw_line(widget.style.fg_gc(widget.state),
-                        @last.x, @last.y,
-                        ev.x, ev.y)
-
-      x1, x2 = if (@last.x < ev.x)
-                 [@last.x, ev.x]
-               else
-                 [ev.x,    @last.x]
-               end
-      y1, y2 = if (@last.y < ev.y)
-                 [@last.y, ev.y]
-               else
-                 [ev.y,    @last.y]
-               end
-      widget.queue_draw_area(x1, y1,
-                             x2 - x1 + 1, y2 - y1 + 1)
+  drawing_area.signal_connect "button-press-event" do |da, ev|
+    return false unless surface
+
+    if (ev.button == Gdk::BUTTON_PRIMARY)
+      draw_brush(da, surface, ev.x, ev.y)
+    elsif (ev.button == Gdk::BUTTON_SECONDARY)
+      clear_surface(surface)
+      da.queue_draw
     end
-    @last = nil
-    @last = ev
+
     true
   end
-end
+  # Ask to receive events the drawing area doesn't normally
+  # subscribe to. In particular, we need to ask for the
+  # button press and motion notify events that we want to handle.
+  drawing_area.add_events([:button_press_mask, :pointer_motion_mask])
 
-window = Gtk::Window.new("drawing test")
-window.signal_connect("destroy") do
-  Gtk.main_quit
+  win.show_all
 end
 
-canvas = A.new
-window.add(canvas)
-
-window.show_all
-Gtk::main
+myapp.run ARGV