gtk3 3.1.0-x64-mingw32 → 3.1.1-x64-mingw32

data/sample/gtk-demo/panes.rb

@@ -19,14 +19,13 @@ class PanesDemo
     @window = Gtk::Window.new(:toplevel)
     @window.screen = main_window.screen
     @window.title = "Paned Widgets"
-    @window.border_width = 0
 
     vbox = Gtk::Box.new(:vertical, 0)
     @window.add(vbox)
 
     vpaned = Gtk::Paned.new(:vertical)
     vbox.pack_start(vpaned, :expand => true, :fill => true, :padding => 0)
-    vpaned.border_width = 5
+    vpaned.margin = 5
 
     @hpaned = Gtk::Paned.new(:horizontal)
     vpaned.add1(@hpaned)
@@ -76,7 +75,7 @@ class PanesDemo
     child1 = @hpaned.child1
     child2 = @hpaned.child2
     frame = Gtk::Frame.new(frame_label)
-    frame.border_width = 4
+    frame.margin = 4
 
     @table = Gtk::Grid.new
     frame.add(@table)

data/sample/gtk-demo/pickers.rb

@@ -12,7 +12,6 @@ class PickersDemo
     @window = Gtk::Window.new(:toplevel)
     @window.screen = main_window.screen
     @window.title = "Pickers"
-    @window.border_width = 10
 
     initialize_grid
 
@@ -28,6 +27,7 @@ class PickersDemo
 
     label = generate_label("File:")
     picker = Gtk::FileChooserButton.new("Pick a file", :open)
+    picker.local_only = true
     @table.attach(label, 0, 2, 1, 1)
     @table.attach(picker, 1, 2, 1, 1)
 
@@ -38,7 +38,7 @@ class PickersDemo
 
     label = generate_label("Mail:")
     picker = Gtk::AppChooserButton.new("x-scheme-handler/mailto")
-    picker.set_show_dialog_item(true)
+    picker.show_dialog_item = true
     @table.attach(label, 0, 4, 1, 1)
     @table.attach(picker, 1, 4, 1, 1)
   end
@@ -58,14 +58,15 @@ class PickersDemo
     @table = Gtk::Grid.new
     @table.row_spacing = 3
     @table.column_spacing = 10
+    @table.margin = 20
     @window.add(@table)
   end
 
   def generate_label(label)
     label = Gtk::Label.new(label)
-    label.set_halign(:start)
-    label.set_valign(:center)
-    label.set_hexpand(true)
+    label.halign = :start
+    label.valign = :center
+    label.hexpand = :true
     label
   end
 end

data/sample/gtk-demo/popover.rb

@@ -13,7 +13,7 @@ class PopoverDemo
     @window = Gtk::Window.new(:toplevel)
     @window.screen = main_window.screen
     box = Gtk::Box.new(:vertical, 24)
-    box.border_width = 24
+    box.margin = 24
     @window.add(box)
 
     widget = add_toggle_button_with_popover
@@ -39,7 +39,7 @@ class PopoverDemo
     popover = Gtk::Popover.new(parent)
     popover.position = pos
     popover.add(child)
-    popover.border_width = 6
+    child.margin = 6
     child.show
     popover
   end
@@ -51,11 +51,6 @@ class PopoverDemo
     content.parent.remove(content)
     window.destroy
     popover = create_popover(parent, content, pos)
-    popover.set_size_request(200, -1)
-    popover.vexpand = true
-    popover.margin_start = 10
-    popover.margin_end = 10
-    popover.margin_bottom = 10
     popover
   end
 

data/sample/gtk-demo/popover.ui

@@ -59,6 +59,7 @@
             <property name="visible">1</property>
             <property name="can_focus">1</property>
             <property name="shadow_type">in</property>
+            <property name="max-content-height">100</property>
             <child>
               <object class="GtkTreeView" id="treeview1">
                 <property name="visible">1</property>

data/sample/gtk-demo/revealer.rb

@@ -45,8 +45,10 @@ class RevealerDemo
       revealer.reveal_child = true
 
       revealer.signal_connect "notify::child-revealed" do |widget|
-        revealed = widget.child_revealed?
-        widget.reveal_child = revealed
+        if widget.mapped?
+          revealed = widget.child_revealed?
+          widget.reveal_child = !revealed
+        end
       end
 
       @count += 1

data/sample/gtk-demo/revealer.ui

@@ -2,7 +2,6 @@
 <interface>
   <!-- interface-requires gtk+ 3.6 -->
   <object class="GtkWindow" id="window">
-    <property name="border_width">5</property>
     <property name="default_width">300</property>
     <property name="default_height">300</property>
     <property name="title">Revealer</property>

data/sample/gtk-demo/scale.ui

@@ -4,23 +4,29 @@
   <object class="GtkAdjustment" id="adjustment1">
     <property name="upper">4</property>
     <property name="value">2</property>
+    <property name="step-increment">0.1</property>
+    <property name="page-increment">1</property>
   </object>
   <object class="GtkAdjustment" id="adjustment2">
     <property name="upper">4</property>
     <property name="value">2</property>
+    <property name="step-increment">0.1</property>
+    <property name="page-increment">1</property>
   </object>
   <object class="GtkAdjustment" id="adjustment3">
     <property name="upper">4</property>
     <property name="value">2</property>
+    <property name="step-increment">0.1</property>
+    <property name="page-increment">1</property>
   </object>
   <object class="GtkWindow" id="window1">
     <property name="title" translatable="yes">Scales</property>
-    <property name="border-width" translatable="yes">20</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <property name="visible">1</property>
         <property name="row-spacing">10</property>
         <property name="column-spacing">10</property>
+        <property name="margin">20</property>
         <child>
           <object class="GtkLabel">
             <property name="visible">1</property>

data/sample/gtk-demo/search_entry.rb

@@ -40,7 +40,7 @@ class SearchEntryDemo
   def initialize_box
     @vbox = Gtk::Box.new(:vertical, 5)
     @window.add(@vbox)
-    @vbox.border_width = 5
+    @vbox.margin = 5
 
     label = Gtk::Label.new("")
     label.markup = "Search entry demo"
@@ -48,7 +48,6 @@ class SearchEntryDemo
 
     @hbox = Gtk::Box.new(:horizontal, 10)
     @vbox.pack_start(@hbox, :expand => true, :fill => true, :padding => 0)
-    @hbox.border_width = 0
   end
 
   def initialize_entry

data/sample/gtk-demo/search_entry2.rb

@@ -61,7 +61,6 @@ class SearchEntry2Demo
   def initialize_vbox
     @vbox = Gtk::Box.new(:vertical, 0)
     @window.add(@vbox)
-    @vbox.border_width = 0
   end
 
   def initialize_help_label
@@ -81,7 +80,6 @@ class SearchEntry2Demo
   def initialize_result_hbox
     hbox = Gtk::Box.new(:horizontal, 10)
     @vbox.pack_start(hbox, :expand => true, :fill => true, :padding => 0)
-    hbox.border_width = 0
 
     # Result
     label = Gtk::Label.new("Result:")
@@ -101,7 +99,6 @@ class SearchEntry2Demo
   def initialize_signal_hbox
     hbox = Gtk::Box.new(:horizontal, 10)
     @vbox.pack_start(hbox, :expand => true, :fill => true, :padding => 0)
-    hbox.border_width = 0
 
     label = Gtk::Label.new("Signal:")
     label.xalign = 0.0

data/sample/gtk-demo/shortcuts-builder.ui

@@ -375,6 +375,7 @@
     <child>
       <object class="GtkShortcutsSection">
         <property name="visible">1</property>
+        <property name="max-height">16</property>
         <property name="section-name">terminal</property>
         <property name="title" translatable="yes">Terminal Shortcuts</property>
         <child>
@@ -452,6 +453,43 @@
           </object>
         </child>
 
+        <child>
+          <object class="GtkShortcutsGroup">
+            <property name="visible">1</property>
+            <property name="title" translatable="yes">'Special' combinations</property>
+
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
+                <property name="accelerator">t+t</property>
+                <property name="title" translatable="yes">You want tea ?</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
+                <property name="accelerator">&lt;shift&gt;&lt;ctrl&gt;</property>
+                <property name="title" translatable="yes">Shift Control</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
+                <property name="accelerator">&lt;ctrl&gt;&amp;&lt;ctrl&gt;</property>
+                <property name="title" translatable="yes">Control Control</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
+                <property name="accelerator">Control_L&amp;Control_R</property>
+                <property name="title" translatable="yes">Left and right control</property>
+              </object>
+            </child>
+
+          </object>
+        </child>
+
         <child>
           <object class="GtkShortcutsGroup">
             <property name="visible">1</property>
@@ -499,41 +537,18 @@
                 <property name="title" translatable="yes">A stock swipe gesture</property>
               </object>
             </child>
-
-          </object>
-        </child>
-
-        <child>
-          <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
-            <property name="title" translatable="yes">'Special' combinations</property>
-
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
-                <property name="accelerator">t+t</property>
-                <property name="title" translatable="yes">You want tea ?</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;shift&gt;&lt;ctrl&gt;</property>
-                <property name="title" translatable="yes">Shift Control</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;&amp;&lt;ctrl&gt;</property>
-                <property name="title" translatable="yes">Control Control</property>
+                <property name="shortcut-type">gesture-swipe-left</property>
+                <property name="title" translatable="yes">A stock swipe gesture</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
-                <property name="accelerator">Control_L&amp;Control_R</property>
-                <property name="title" translatable="yes">Left and right control</property>
+                <property name="shortcut-type">gesture-swipe-right</property>
+                <property name="title" translatable="yes">A stock swipe gesture</property>
               </object>
             </child>
 

data/sample/gtk-demo/sizegroup.rb

@@ -29,7 +29,7 @@ class SizegroupDemo
 
     @vbox = Gtk::Box.new(:vertical, 5)
     @window.add(@vbox)
-    @vbox.border_width = 5
+    @vbox.margin = 5
 
     size_group = Gtk::SizeGroup.new(:horizontal)
 
@@ -45,15 +45,16 @@ class SizegroupDemo
 
     # And a check button to turn grouping on and off
     check_button = Gtk::CheckButton.new("_Enable grouping")
-    check_button.set_use_underline(true)
+    check_button.use_underline = true
+    check_button.active = true
     @vbox.pack_start(check_button,
                      :expand => false, :fill => false, :padding => 0)
 
     check_button.signal_connect("toggled") do |widget|
       if widget.active?
-        size_group.set_mode(:horizontal)
+        size_group.mode = :horizontal
       else
-        size_group.set_mode(:none)
+        size_group.mode = :none
       end
     end
   end
@@ -74,24 +75,24 @@ class SizegroupDemo
     @vbox.pack_start(frame, :expand => false, :fill => false, :padding => 0)
 
     table = Gtk::Grid.new
-    table.set_border_width(5)
-    table.set_row_spacing(5)
-    table.set_column_spacing(10)
+    table.margin = 5
+    table.row_spacing = 5
+    table.column_spacing = 10
     frame.add(table)
     table
   end
 
   def add_row(table, row, size_group, label_text, options)
     label = Gtk::Label.new(label_text, :use_underline => true)
-    label.set_halign(:start)
-    label.set_valign(:baseline)
-    label.set_hexpand(true)
+    label.halign = :start
+    label.valign = :baseline
+    label.hexpand = true
     table.attach(label, 0, row, 1, 1)
 
     combo_box = create_combo_box(options)
-    label.set_mnemonic_widget(combo_box)
-    combo_box.set_halign(:end)
-    combo_box.set_valign(:baseline)
+    label.mnemonic_widget = combo_box
+    combo_box.halign = :end
+    combo_box.valign = :baseline
     size_group.add_widget(combo_box)
     table.attach(combo_box, 1, row, 1, 1)
   end
@@ -101,7 +102,7 @@ class SizegroupDemo
     options.each do |o|
       combo_box.append_text(o)
     end
-    combo_box.set_active(0)
+    combo_box.active = 0
     combo_box
   end
 end

data/sample/gtk-demo/spinner.rb

@@ -53,7 +53,7 @@ class SpinnerDemo
     @vbox = Gtk::Box.new(:vertical, 5)
     content_area.pack_start(@vbox,
                             :expand => true, :fill => true, :padding => 0)
-    @vbox.border_width = 5
+    @vbox.margin = 5
   end
 
   def initialize_sensitive_box

data/sample/gtk-demo/textview.rb

@@ -1,436 +1,412 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2003-2005 Ruby-GNOME2 Project Team
+# Copyright (c) 2017 Ruby-GNOME2 Project Team
 # This program is licenced under the same licence as Ruby-GNOME2.
 #
-# $Id: textview.rb,v 1.8 2005/02/06 18:25:13 kzys Exp $
 =begin
-= Text Widget/Multiple Views
+=  Text View/Multiple Views
 
-The Gtk::TextView widget displays a Gtk::TextBuffer.
-One Gtk::TextBuffer can be displayed by multiple Gtk::TextViews.
-This demo has two views displaying a single buffer,
-and shows off the widget's text formatting features.
-=end
-require 'common'
-
-module Demo
-  class TextView < BasicWindow
-
-    GRAY50_WIDTH = 2
-    GRAY50_HEIGHT = 2
-    GRAY50_BITS = [0x02, 0x01].pack("c")
-    @@nest_window = nil
-
-    def initialize
-      super("TextView Window")
-
-      set_default_size(450, 450)
-
-      set_title("TextView")
-      set_border_width(0)
-
-      vpaned = Gtk::VPaned.new
-      vpaned.set_border_width(5)
-      add(vpaned)
-      ##
-      # For convenience, we just use the autocreated buffer from
-      # the first text view; you could also create the buffer
-      # by itself with Gtk::TextBuffer.new, then later create
-      # a view widget.
-      #
-      view1 = Gtk::TextView.new
-      buffer = view1.buffer
-      view2 = Gtk::TextView.new(buffer)
-
-      sw = Gtk::ScrolledWindow.new(nil, nil)
-      sw.set_policy(:automatic,
-                    :automatic)
-      vpaned.add1(sw)
-
-      sw.add(view1)
-
-      sw = Gtk::ScrolledWindow.new(nil, nil)
-      sw.set_policy(:automatic,
-                    :automatic)
-      vpaned.add2(sw)
-
-      sw.add(view2)
-
-      create_tags(buffer)
-      insert_text(buffer)
-
-      attach_widgets(view1)
-      attach_widgets(view2)
-
-      vpaned.show_all
-
-      self.show
-    end
-
-    def create_tags(buffer)
-      ##
-      #  Create a bunch of tags. Note that it's also possible to
-      #  create tags with Gtk::TextTag.new then add them to the
-      #  tag table for the buffer, Gtk::TextBuffer#create_tag is
-      #  just a convenience function. Also note that you don't have
-      #  to give tags a name; pass NULL for the name to create an
-      #  anonymous tag.
-      #
-      #  In any real app, another useful optimization would be to create
-      #  a Gtk::TextTagTable in advance, and reuse the same tag table for
-      #  all the buffers with the same tag set, instead of creating
-      #  new copies of the same tags for every buffer.
-      #
-      #  Tags are assigned default priorities in order of addition to the
-      #  tag table.         That is, tags created later that affect the same text
-      #  property affected by an earlier tag will override the earlier
-      #  tag.  You can modify tag priorities with
-      #  Gtk::TextTag#set_priority.
-      #
-
-      buffer.create_tag('heading',
-                        'weight' => Pango::FontDescription::WEIGHT_BOLD,
-                        'size' => 15 * Pango::SCALE)
-
-      buffer.create_tag("italic",
-                        "style" => Pango::FontDescription::STYLE_ITALIC)
-
-      buffer.create_tag("bold",
-                        "weight" => Pango::FontDescription::WEIGHT_BOLD)
-
-      buffer.create_tag("big",
-                        # points times the PANGO_SCALE factor
-                        "size" => 20 * Pango::SCALE)
+ The GtkTextView widget displays a GtkTextBuffer. One GtkTextBuffer
+ can be displayed by multiple GtkTextViews. This demo has two views
+ displaying a single buffer, and shows off the widget's text
+ formatting features.
 
-      buffer.create_tag("xx-small",
-                        "scale" => Pango::AttrScale::XX_SMALL)
-
-      buffer.create_tag("x-large",
-                        "scale" => Pango::AttrScale::X_LARGE)
-
-      buffer.create_tag("monospace", "family" => "monospace")
-
-      buffer.create_tag("blue_foreground", "foreground" => "blue")
-
-      buffer.create_tag("red_background", "background" => "red")
-
-      stipple = Gdk::Pixmap.create_from_data(nil, GRAY50_BITS, GRAY50_WIDTH,
-                                             GRAY50_HEIGHT)
-
-      buffer.create_tag("background_stipple",
-                        "background_stipple" => stipple)
-
-      buffer.create_tag("foreground_stipple",
-                        "foreground_stipple" => stipple)
-
-      buffer.create_tag("big_gap_before_line",
-                        "pixels_above_lines" => 30)
-
-      buffer.create_tag("big_gap_after_line",
-                        "pixels_below_lines" => 30)
-
-      buffer.create_tag("double_spaced_line",
-                        "pixels_inside_wrap" => 10)
-
-      buffer.create_tag("not_editable",
-                         "editable" => false)
-
-      buffer.create_tag("word_wrap",
-                        "wrap_mode" => :word)
-
-      buffer.create_tag("char_wrap",
-                        "wrap_mode" => Gtk::TextTag::WRAP_CHAR)
-
-      buffer.create_tag("no_wrap",
-                        "wrap_mode" => :none)
+=end
+class TextviewDemo
+  def initialize(main_window)
+    @window = Gtk::Window.new(:toplevel)
+    @window.screen = main_window.screen
+    @window.set_default_size(450, 450)
+    @window.title = "Multiple Views"
 
-      buffer.create_tag("center",
-                        "justification" => Gtk::JUSTIFY_CENTER)
+    vpaned = Gtk::Paned.new(:vertical)
+    @window.add(vpaned)
 
-      buffer.create_tag("right_justify",
-                        "justification" => Gtk::JUSTIFY_RIGHT)
+    # For convenience, we just use the autocreated buffer from
+    # the first text view; you could also create the buffer
+    # by itself Gtk::TextBuffer.new, then later create a view
+    # widget.
 
-      buffer.create_tag("wide_margins",
-                        "left_margin" => 50,
-                          "right_margin" => 50)
+    view1 = Gtk::TextView.new
+    view2 = Gtk::TextView.new(view1.buffer)
 
-      buffer.create_tag("strikethrough",
-                        "strikethrough" => true)
+    sw = Gtk::ScrolledWindow.new
+    sw.set_policy(:automatic, :automatic)
+    vpaned.add1(sw)
+    sw.add(view1)
 
-      buffer.create_tag("underline",
-                        "underline" => Pango::AttrUnderline::SINGLE)
+    sw = Gtk::ScrolledWindow.new
+    sw.set_policy(:automatic, :automatic)
+    vpaned.add2(sw)
+    sw.add(view2)
 
-      buffer.create_tag("double_underline",
-                        "underline" => Pango::AttrUnderline::DOUBLE)
+    create_tags(view1.buffer)
+    insert_text(view1.buffer)
 
-      buffer.create_tag("superscript",
-                        "rise" => 10 * Pango::SCALE, #  10 pixels
-                        "size" => 8 * Pango::SCALE)  #  8 points
+    attach_widgets(view1)
+    attach_widgets(view2)
 
-      buffer.create_tag("subscript",
-                        "rise" => -10 * Pango::SCALE, #  10 pixels
-                        "size" => 8 * Pango::SCALE) #  8 points
+    vpaned.show_all
+  end
 
-      buffer.create_tag("rtl_quote",
-                        "wrap_mode" => :word,
-                        "direction" => Gtk::Widget::TEXT_DIR_RTL,
-                        "indent" => 30,
-                        "left_margin" => 20,
-                        "right_margin" => 20)
+  def run
+    if !@window.visible?
+      @window.show_all
+    else
+      @window.destroy
     end
+    @window
+  end
 
-    def insert_text(buffer)
-
-      ##
-      #  Demo.find_file looks in the the current directory first,
-      # so you can run gtk-demo without installing GTK, then looks
-      # in the location where the file is installed.
-      #
-
-      filename = Demo.find_file("gtk-logo-rgb.gif")
-      pixbuf = Gdk::Pixbuf.new(filename) if filename
-
-      unless pixbuf
-        $stderr.print "Failed to load image file gtk-logo-rgb.gif\n"
-        exit 1
-      end
-
-      scaled = pixbuf.scale(32, 32, Gdk::Pixbuf::INTERP_BILINEAR)
-      pixbuf = scaled
-
-      ##
-      #  get start of buffer; each insertion will revalidate the
-      #  iterator to point to just after the inserted text.
-      #
-
-      iter = buffer.get_iter_at(:offset => 0)
-
-      buffer.insert(iter, "The text widget can display text with all kinds of nifty attributes. It also supports multiple views of the same buffer; this demo is showing the same buffer in two places.\n\n")
-
-      buffer.insert(iter, "Font styles. ", 'heading')
-
-      buffer.insert(iter, "For example, you can have ")
-      buffer.insert(iter, "italic", "italic")
-      buffer.insert(iter, ", ")
-      buffer.insert(iter, "bold", "bold")
-      buffer.insert(iter, ", or ")
-      buffer.insert(iter, "monospace(typewriter)", "monospace")
-      buffer.insert(iter, ", or ")
-      buffer.insert(iter, "big", "big")
-      buffer.insert(iter, " text. ")
-      buffer.insert(iter, "It's best not to hardcode specific text sizes; you can use relative sizes as with CSS, such as ")
-      buffer.insert(iter, "xx-small", "xx-small")
-      buffer.insert(iter, " or ")
-      buffer.insert(iter, "x-large", "x-large")
-      buffer.insert(iter, " to ensure that your program properly adapts if the user changes the default font size.\n\n")
-
-      buffer.insert(iter, "Colors. ", "heading")
-
-      buffer.insert(iter, "Colors such as ")
-      buffer.insert(iter, "a blue foreground", "blue_foreground")
-      buffer.insert(iter, " or ")
-      buffer.insert(iter, "a red background", "red_background")
-      buffer.insert(iter, " or even ")
-      buffer.insert(iter, "a stippled red background",
-                    "red_background", "background_stipple")
-
-      buffer.insert(iter, " or ")
-      buffer.insert(iter, "a stippled blue foreground on solid red background",
-                    "blue_foreground", "red_background", "foreground_stipple")
+  private
 
-      buffer.insert(iter, "(select that to read it) can be used.\n\n")
+  def create_tags(buffer)
+    # Create a bunch of tags. Note that it's also possible to
+    # create tags with Gtk::TextTag.new then add them to the
+    # tag table for the buffer, Gtk::TextBuffer.create_tag is
+    # just a convenience function. Also note that you don't have
+    # to give tags a name; pass NULL for the name to create an
+    # anonymous tag.
+    #
+    # In any real app, another useful optimization would be to create
+    # a Gtk::TextTagTable in advance, and reuse the same tag table for
+    # all the buffers with the same tag set, instead of creating
+    # new copies of the same tags for every buffer.
+    #
+    # Tags are assigned default priorities in order of addition to the
+    # tag table.  That is, tags created later that affect the same text
+    # property affected by an earlier tag will override the earlier
+    # tag.  You can modify tag priorities with
+    # Gtk::TextTag.priority=.
 
-      buffer.insert(iter, "Underline, strikethrough, and rise. ", "heading")
+    buffer.create_tag("heading",
+                      "weight" => Pango::WEIGHT_BOLD,
+                      "size" => 15 * Pango::SCALE)
 
-      buffer.insert(iter, "Strikethrough", "strikethrough")
-      buffer.insert(iter, ", ")
-      buffer.insert(iter, "underline", "underline")
-      buffer.insert(iter, ", ")
-      buffer.insert(iter, "double underline", "double_underline")
-      buffer.insert(iter, ", ")
-      buffer.insert(iter, "superscript", "superscript")
-      buffer.insert(iter, ", and ")
-      buffer.insert(iter, "subscript", "subscript")
-      buffer.insert(iter, " are all supported.\n\n")
+    buffer.create_tag("italic",
+                      "style" => Pango::STYLE_ITALIC)
 
-      buffer.insert(iter, "Images. ", "heading")
+    buffer.create_tag("bold",
+                      "weight" => Pango::WEIGHT_BOLD)
 
-      buffer.insert(iter, "The buffer can have images in it: ")
-      buffer.insert(iter, pixbuf)
-      buffer.insert(iter, pixbuf)
-      buffer.insert(iter, pixbuf)
-      buffer.insert(iter, " for example.\n\n")
+    buffer.create_tag("big",
+                      # points times the PANGO_SCALE factor
+                      "size" => 20 * Pango::SCALE)
 
-      buffer.insert(iter, "Spacing. ", "heading")
+    buffer.create_tag("xx-small",
+                      "scale" => Pango::AttrScale::XX_SMALL)
 
-      buffer.insert(iter, "You can adjust the amount of space before each line.\n")
+    buffer.create_tag("x-large",
+                      "scale" => Pango::AttrScale::X_LARGE)
 
-      buffer.insert(iter, "This line has a whole lot of space before it.\n",
-                    "big_gap_before_line", "wide_margins")
-      buffer.insert(iter, "You can also adjust the amount of space after each line; this line has a whole lot of space after it.\n",
-                    "big_gap_after_line", "wide_margins")
+    buffer.create_tag("monospace", "family" => "monospace")
 
-      buffer.insert(iter, "You can also adjust the amount of space between wrapped lines; this line has extra space between each wrapped line in the same paragraph. To show off wrapping, some filler text: the quick brown fox jumped over the lazy dog. Blah blah blah blah blah blah blah blah blah.\n",
-                    "double_spaced_line", "wide_margins")
+    buffer.create_tag("blue_foreground", "foreground" => "blue")
 
-      buffer.insert(iter, "Also note that those lines have extra-wide margins.\n\n")
+    buffer.create_tag("red_background", "background" => "red")
 
-      buffer.insert(iter, "Editability. ", "heading")
+    buffer.create_tag("big_gap_before_line",
+                      "pixels_above_lines" => 30)
 
-      buffer.insert(iter, "This line is 'locked down' and can't be edited by the user - just try it! You can't delete this line.\n\n",
-                    "not_editable")
+    buffer.create_tag("big_gap_after_line",
+                      "pixels_below_lines" => 30)
 
-      buffer.insert(iter, "Wrapping. ", "heading")
+    buffer.create_tag("double_spaced_line",
+                      "pixels_inside_wrap" => 10)
 
-      buffer.insert(iter, "This line(and most of the others in this buffer) is word-wrapped, using the proper Unicode algorithm. Word wrap should work in all scripts and languages that GTK+ supports. Let's make this a long paragraph to demonstrate: blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah\n\n")
+    buffer.create_tag("not_editable",
+                      "editable" => false)
 
-      buffer.insert(iter, "This line has character-based wrapping, and can wrap between any two character glyphs. Let's make this a long paragraph to demonstrate: blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah\n\n", "char_wrap")
+    buffer.create_tag("word_wrap",
+                      "wrap_mode" => :word)
 
-      buffer.insert(iter, "This line has all wrapping turned off, so it makes the horizontal scrollbar appear.\n\n\n", "no_wrap")
+    buffer.create_tag("char_wrap",
+                      "wrap_mode" => :char)
 
-      buffer.insert(iter, "Justification. ", "heading")
+    buffer.create_tag("no_wrap",
+                      "wrap_mode" => :none)
 
-      buffer.insert(iter, "\nThis line has center justification.\n", "center")
+    buffer.create_tag("center",
+                      "justification" => :center)
 
-      buffer.insert(iter, "This line has right justification.\n",
-                    "right_justify")
+    buffer.create_tag("right_justify",
+                      "justification" => :right)
 
-      buffer.insert(iter, "\nThis line has big wide margins. Text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text.\n", "wide_margins")
+    buffer.create_tag("wide_margins",
+                      "left_margin" => 50,
+                      "right_margin" => 50)
 
-      buffer.insert(iter, "Internationalization. ", "heading")
+    buffer.create_tag("strikethrough",
+                      "strikethrough" => true)
 
-      buffer.insert(iter, "You can put all sorts of Unicode text in the buffer.\n\nGerman(Deutsch Süd) Grüß Gott\nGreek(Ελληνικά) Γειά σας\nHebrew        שלום\nJapanese(日本語)\n\nThe widget properly handles bidirectional text, word wrapping, DOS/UNIX/Unicode paragraph separators, grapheme boundaries, and so on using the Pango internationalization framework.\n")
+    buffer.create_tag("underline",
+                      "underline" => Pango::UNDERLINE_SINGLE)
 
-      buffer.insert(iter, "Here's a word-wrapped quote in a right-to-left language:\n")
-      buffer.insert(iter, "??? ??? ???? ?? ???? ???????? ????? ?? ???? ?????? ??????? ??????? ?? ???? ?????? ?? ????? ?? ??????? ????? ??????? ??? ?????? ????? ?????? ????? ???? ?? ?????? ?????? ?? ???????? ?????? ????? ?? ???? ???? ????????? ???????. ???? ???? ??? ???????? ????? ?? »????????« ?? ???????.\n\n", "rtl_quote")
+    buffer.create_tag("double_underline",
+                      "underline" => Pango::UNDERLINE_DOUBLE)
 
-      buffer.insert(iter, "You can put widgets in the buffer: Here's a button: ")
-      anchor = buffer.create_child_anchor(iter)
-      buffer.insert(iter, " and a menu: ")
-      anchor = buffer.create_child_anchor(iter)
-      buffer.insert(iter, " and a scale: ")
-      anchor = buffer.create_child_anchor(iter)
-      buffer.insert(iter, " and an animation: ")
-      anchor = buffer.create_child_anchor(iter)
-      buffer.insert(iter, " finally a text entry: ")
-      anchor = buffer.create_child_anchor(iter)
-      buffer.insert(iter, ".\n")
+    buffer.create_tag("superscript",
+                      "rise" => 10 * Pango::SCALE, #  10 pixels
+                      "size" => 8 * Pango::SCALE)  #  8 points
 
-      buffer.insert(iter, "\n\nThis demo doesn't demonstrate all the Gtk::TextBuffer features; it leaves out, for example: invisible/hidden text(doesn't work in GTK 2, but planned), tab stops, application-drawn areas on the sides of the widget for displaying breakpoints and such...")
+    buffer.create_tag("subscript",
+                      "rise" => -10 * Pango::SCALE, #  10 pixels
+                      "size" => 8 * Pango::SCALE) #  8 points
 
-      #  Apply word_wrap tag to whole buffer
+    buffer.create_tag("rtl_quote",
+                      "wrap_mode" => :word,
+                      "direction" => Gtk::TextDirection::RTL,
+                      "indent" => 30,
+                      "left_margin" => 20,
+                      "right_margin" => 20)
+  end
 
-      buf_start, buf_end = buffer.bounds
-      buffer.apply_tag("word_wrap", buf_start, buf_end)
-    end
+  def insert_text(buffer)
+    icon_theme = Gtk::IconTheme.default
+    pixbuf = icon_theme.load_icon("gtk3-demo", 32, :generic_fallback)
+
+    # get start of buffer; each insertion will revalidate the
+    # iterator to point to just after the inserted text.
+
+    iter = buffer.get_iter_at(:offset => 0)
+    buffer.insert(iter, <<TEXT)
+The text widget can display text with all kinds of nifty attributes. It \
+also supports multiple views of the same buffer; this demo is showing the \
+same buffer in two places.
+TEXT
+    buffer.insert(iter, "Font styles. ", :tags => ["heading"])
+    buffer.insert(iter, "For example, you can have ")
+    buffer.insert(iter, "italic", :tags => ["italic"])
+    buffer.insert(iter, ", ")
+    buffer.insert(iter, "bold", :tags => ["bold"])
+    buffer.insert(iter, ", or ")
+    buffer.insert(iter, "monospace(typewriter)", :tags => ["monospace"])
+    buffer.insert(iter, ", or ")
+    buffer.insert(iter, "big", :tags => ["big"])
+    buffer.insert(iter, " text. ")
+    buffer.insert(iter, "It's best not to hardcode specific text sizes; you can\
+ use relative sizes as with CSS, such as ")
+    buffer.insert(iter, "xx-small", :tags => ["xx-small"])
+    buffer.insert(iter, " or ")
+    buffer.insert(iter, "x-large", :tags => ["x-large"])
+    buffer.insert(iter, " to ensure that your program properly adapts if the \
+user changes the default font size.\n\n")
+
+    buffer.insert(iter, "Colors. ", :tags => ["heading"])
+
+    buffer.insert(iter, "Colors such as ")
+    buffer.insert(iter, "a blue foreground", :tags => ["blue_foreground"])
+    buffer.insert(iter, " or ")
+    buffer.insert(iter, "a red background", :tags => ["red_background"])
+    buffer.insert(iter, " or even ")
+    buffer.insert(iter, "a blue foreground on red background",
+                  :tags => %w(blue_foreground red_background))
+
+    buffer.insert(iter, "(select that to read it) can be used.\n\n")
+
+    buffer.insert(iter, "Underline, strikethrough, and rise. ",
+                  :tags => ["heading"])
+
+    buffer.insert(iter, "Strikethrough", :tags => ["strikethrough"])
+    buffer.insert(iter, ", ")
+    buffer.insert(iter, "underline", :tags => ["underline"])
+    buffer.insert(iter, ", ")
+    buffer.insert(iter, "double underline", :tags => ["double_underline"])
+    buffer.insert(iter, ", ")
+    buffer.insert(iter, "superscript", :tags => ["superscript"])
+    buffer.insert(iter, ", and ")
+    buffer.insert(iter, "subscript", :tags => ["subscript"])
+    buffer.insert(iter, " are all supported.\n\n")
+
+    buffer.insert(iter, "Images. ", :tags => ["heading"])
+
+    buffer.insert(iter, "The buffer can have images in it: ")
+    buffer.insert(iter, pixbuf)
+    buffer.insert(iter, pixbuf)
+    buffer.insert(iter, pixbuf)
+    buffer.insert(iter, " for example.\n\n")
+
+    buffer.insert(iter, "Spacing. ", :tags => ["heading"])
+
+    buffer.insert(iter,
+                  "You can adjust the amount of space before each line.\n")
+
+    buffer.insert(iter, "This line has a whole lot of space before it.\n",
+                  :tags => %w(big_gap_before_line wide_margins))
+    buffer.insert(iter, "You can also adjust the amount of space after each \
+line; this line has a whole lot of space after it.\n",
+                  :tags => %w(big_gap_after_line wide_margins))
+    text = "You can also adjust the amount of space between wrapped lines; \
+this line has extra space between each wrapped line in the same paragraph. To \
+show off wrapping, some filler text: the quick brown fox jumped over the lazy \
+dog. Blah blah blah blah blah blah blah blah blah.\n"
+    buffer.insert(iter, text,
+                  :tags => %w(double_spaced_line wide_margins))
+
+    buffer.insert(iter,
+                  "Also note that those lines have extra-wide margins.\n\n")
+
+    buffer.insert(iter, "Editability. ", :tags => ["heading"])
+
+    buffer.insert(iter, "This line is 'locked down' and can't be edited by the \
+user - just try it! You can't delete this line.\n\n",
+                  :tags => ["not_editable"])
+
+    buffer.insert(iter, "Wrapping. ", :tags => ["heading"])
+
+    buffer.insert(iter, "This line(and most of the others in this buffer) is \
+word-wrapped, using the proper Unicode algorithm. Word wrap should work in all\
+ scripts and languages that GTK+ supports. Let's make this a long paragraph to\
+ demonstrate: blah blah blah blah blah blah blah blah blah blah blah blah blah\
+ blah blah blah blah blah blah\n\n")
+
+    buffer.insert(iter, "This line has character-based wrapping, and can wrap \
+between any two character glyphs. Let's make this a long paragraph to \
+demonstrate: blah blah blah blah blah blah blah blah blah blah blah blah blah \
+blah blah blah blah blah blah\n\n", :tags => ["char_wrap"])
+
+    buffer.insert(iter, "This line has all wrapping turned off, so it makes \
+the horizontal scrollbar appear.\n\n\n", :tags => ["no_wrap"])
+
+    buffer.insert(iter, "Justification. ", :tags => ["heading"])
+
+    buffer.insert(iter, "\nThis line has center justification.\n",
+                  :tags => ["center"])
+
+    buffer.insert(iter, "This line has right justification.\n",
+                  :tags => ["right_justify"])
+
+    buffer.insert(iter, "\nThis line has big wide margins. Text text text text\
+ text text text text text text text text text text text text text text text \
+text text text text text text text text text text text text text text text \
+text text.\n", :tags => ["wide_margins"])
+
+    buffer.insert(iter, "Internationalization. ", :tags => ["heading"])
+
+    buffer.insert(iter, "You can put all sorts of Unicode text in the buffer.\
+\n\nGerman(Deutsch Süd) Grüß Gott\nGreek(Ελληνικά) Γειά σας\nHebrew        \
+שלום\nJapanese(日本語)\n\nThe widget properly handles bidirectional text, word\
+ wrapping, DOS/UNIX/Unicode paragraph separators, grapheme boundaries, and so \
+ on using the Pango internationalization framework.\n")
+
+    buffer.insert(iter,
+                  "Here's a word-wrapped quote in a right-to-left language:\n")
+    buffer.insert(iter, "\331\210\331\202\330\257 \330\250\330\257\330\243 \
+\330\253\331\204\330\247\330\253 \331\205\331\206 \330\243\331\203\330\253\330\
+\261 \330\247\331\204\331\205\330\244\330\263\330\263\330\247\330\252 \330\252\
+\331\202\330\257\331\205\330\247 \331\201\331\212 \330\264\330\250\331\203\330\
+\251 \330\247\331\203\330\263\331\212\331\210\331\206 \330\250\330\261\330\247\
+\331\205\330\254\331\207\330\247 \331\203\331\205\331\206\330\270\331\205\330\
+\247\330\252 \331\204\330\247 \330\252\330\263\330\271\331\211 \331\204\331\
+\204\330\261\330\250\330\255\330\214 \330\253\331\205 \330\252\330\255\331\210\
+\331\204\330\252 \331\201\331\212 \330\247\331\204\330\263\331\206\331\210\330\
+\247\330\252 \330\247\331\204\330\256\331\205\330\263 \330\247\331\204\331\205\
+\330\247\330\266\331\212\330\251 \330\245\331\204\331\211 \331\205\330\244\330\
+\263\330\263\330\247\330\252 \331\205\330\247\331\204\331\212\330\251 \331\205\
+\331\206\330\270\331\205\330\251\330\214 \331\210\330\250\330\247\330\252\330\
+\252 \330\254\330\262\330\241\330\247 \331\205\331\206 \330\247\331\204\331\
+\206\330\270\330\247\331\205 \330\247\331\204\331\205\330\247\331\204\331\212 \
+\331\201\331\212 \330\250\331\204\330\257\330\247\331\206\331\207\330\247\330\
+\214 \331\210\331\204\331\203\331\206\331\207\330\247 \330\252\330\252\330\256\
+\330\265\330\265 \331\201\331\212 \330\256\330\257\331\205\330\251 \331\202\
+\330\267\330\247\330\271 \330\247\331\204\331\205\330\264\330\261\331\210\330\
+\271\330\247\330\252 \330\247\331\204\330\265\330\272\331\212\330\261\330\251.\
+\331\210\330\243\330\255\330\257 \330\243\331\203\330\253\330\261 \331\207\330\
+\260\331\207 \330\247\331\204\331\205\330\244\330\263\330\263\330\247\330\252 \
+\331\206\330\254\330\247\330\255\330\247 \331\207\331\210 \302\273\330\250\330\
+\247\331\206\331\203\331\210\330\263\331\210\331\204\302\253 \331\201\331\212 \
+\330\250\331\210\331\204\331\212\331\201\331\212\330\247.\n\n" ,
+                  :tags => ["rtl_quote"])
+
+    buffer.insert(iter, "You can put widgets in the buffer: Here's a button: ")
+    buffer.create_child_anchor(iter)
+    buffer.insert(iter, " and a menu: ")
+    buffer.create_child_anchor(iter)
+    buffer.insert(iter, " and a scale: ")
+    buffer.create_child_anchor(iter)
+    buffer.insert(iter, " and an animation: ")
+    buffer.create_child_anchor(iter)
+    buffer.insert(iter, " finally a text entry: ")
+    buffer.create_child_anchor(iter)
+    buffer.insert(iter, ".\n")
+
+    buffer.insert(iter, "\n\nThis demo doesn't demonstrate all the \
+Gtk::TextBuffer features; it leaves out, for example: invisible/hidden text \
+(doesn't work in GTK 2, but planned), tab stops, application-drawn areas on \
+the sides of the widget for displaying breakpoints and such...")
+
+    #  Apply word_wrap tag to whole buffer
+
+    buf_start, buf_end = buffer.bounds
+    buffer.apply_tag("word_wrap", buf_start, buf_end)
+  end
 
-    def find_anchor(iter)
-      while iter.forward_char do
-        return true if iter.child_anchor
-      end
-      return false
+  def find_anchor(iter)
+    while iter.forward_char
+      return true if iter.child_anchor
     end
+    false
+  end
 
-    def attach_widgets(text_view)
-
-      buffer = text_view.buffer;
-
-      iter = buffer.start_iter
-
-      i = 0;
-      while find_anchor(iter) do
-        anchor = iter.child_anchor
-
-        if  i == 0
-          widget = Gtk::Button.new("Click Me")
-          widget.signal_connect('clicked') { |button|
-            if @@nest_window and ! @@nest_window.destroyed?
-              @@nest_window.present
-              break
-            end
-
-            buffer = Gtk::TextBuffer.new
-            iter = buffer.start_iter
-
-            buffer.insert(iter, "This buffer is shared by a set of nested text views.\n Nested view:\n")
-            anchor = buffer.create_child_anchor(iter)
-            buffer.insert(iter, "\nDon't do this in real applications, please.\n")
-
-            view = Gtk::TextView.new(buffer)
-
-            recursive_attach_view(0, view, anchor)
-
-            @@nest_window = Gtk::Window.new(Gtk::Window::TOPLEVEL)
-            sw = Gtk::ScrolledWindow.new(nil, nil)
-            sw.set_policy(:automatic,
-                          :automatic)
-
-            @@nest_window.add(sw)
-            sw.add(view)
-
-            @@nest_window.set_default_size(300, 400)
-            @@nest_window.show_all
-          }
-        elsif i == 1
-          menu = Gtk::Menu.new
-          widget = Gtk::OptionMenu.new
-
-          menu_item = Gtk::MenuItem.new("Option 1")
-          menu.append(menu_item)
-          menu_item = Gtk::MenuItem.new("Option 2")
-          menu.append(menu_item)
-          menu_item = Gtk::MenuItem.new("Option 3")
-          menu.append(menu_item)
-
-          widget.menu = menu
-
-        elsif i == 2
-          widget = Gtk::HScale.new
-          widget.set_range(0, 100)
-          widget.set_size_request(70, -1)
-
-        elsif i == 3
-          filename = Demo.find_file("floppybuddy.gif")
-          widget = Gtk::Image.new(filename)
-
-        elsif i == 4
-          widget = Gtk::Entry.new
-
-        else
-          #widget = nil;  avoids a compiler warning
-          #g_assert_not_reached ;
-        end
-
-        text_view.add_child_at_anchor(widget,
-                                      anchor)
-
-        widget.show_all
-        i += 1
+  def attach_widgets(text_view)
+    buffer = text_view.buffer
+    iter = buffer.start_iter
+    i = 0
+    widget = nil
+    while find_anchor(iter)
+      anchor = iter.child_anchor
+
+      if i == 0
+        widget = Gtk::Button.new(:label => "Click Me")
+        widget.signal_connect("clicked") { easter_egg_callback }
+      elsif i == 1
+        widget = Gtk::ComboBoxText.new
+        widget.append_text("Option 1")
+        widget.append_text("Option 2")
+        widget.append_text("Option 3")
+      elsif i == 2
+        widget = Gtk::Scale.new(:horizontal, nil)
+        widget.set_range(0, 100)
+        widget.set_size_request(70, -1)
+      elsif i == 3
+        widget = Gtk::Image.new(:resource => "/textview/floppybuddy.gif")
+      elsif i == 4
+        widget = Gtk::Entry.new
       end
+      text_view.add_child_at_anchor(widget, anchor)
+      widget.show_all
+      i += 1
     end
+  end
 
+  def easter_egg_callback
+    buffer = Gtk::TextBuffer.new
+    iter = buffer.start_iter
+    buffer.insert(iter,
+                  "This buffer is shared by a set of nested text views.\n \
+ Nested view:")
+    anchor = buffer.create_child_anchor(iter)
+    buffer.insert(iter,
+                  "\nDon't do this in real applications, please.\n")
+    view = Gtk::TextView.new(buffer)
+    recursive_attach_view(0, view, anchor)
+
+    window = Gtk::Window.new
+    sw = Gtk::ScrolledWindow.new
+    sw.set_policy(:automatic, :automatic)
+    window.add(sw)
+    sw.add(view)
+    window.set_default_size(300, 400)
+    window.show_all
+  end
 
-    def recursive_attach_view(depth, view, anchor)
-      return  if depth > 4
-
-      child_view = Gtk::TextView.new(view.buffer)
-
-      #  Event box is to add a black border around each child view
-      event_box = Gtk::EventBox.new
-      color = Gdk::Color.parse("black")
-      event_box.modify_bg(Gtk::STATE_NORMAL, color)
-
-      align = Gtk::Alignment.new(0.5, 0.5, 1.0, 1.0)
-      align.set_border_width(1)
-
-      event_box.add(align)
-      align.add(child_view)
+  def recursive_attach_view(depth, view, anchor)
+    return if depth > 4
 
-      view.add_child_at_anchor(event_box, anchor)
-
-      recursive_attach_view(depth + 1, child_view, anchor)
-    end
+    child_view = Gtk::TextView.new(view.buffer)
 
+    # Frame is to add a black border around each child view.
+    frame = Gtk::Frame.new
+    frame.add(child_view)
+    view.add_child_at_anchor(frame, anchor)
+    recursive_attach_view(depth + 1, child_view, anchor)
   end
 end
-