gtk3 1.2.6-x86-mingw32 → 2.0.0-x86-mingw32

data/sample/gtk-demo/clipboard.rb

@@ -15,50 +15,45 @@ module Demo
     def initialize
       super('Clipboard')
 
-      unless Gtk.check_version?(2, 2, 0)
-         add(Gtk::Label.new("This sample requires GTK+ 2.2.0 or later"))
-         return
-      end
-
-      vbox = Gtk::VBox.new(false, 0)
+      vbox = Gtk::Box.new(:vertical)
       vbox.border_width = 8
 
       add(vbox)
 
       label = Gtk::Label.new(%Q["Copy" will copy the text\nin the entry to the clipboard])
 
-      vbox.pack_start(label, false, false, 0)
+      vbox.pack_start(label, :expand => false, :fill => false, :padding => 0)
 
-      hbox = Gtk::HBox.new(false, 0)
+      hbox = Gtk::Box.new(:horizontal, 0)
       hbox.border_width = 8
-      vbox.pack_start(hbox, false, false, 0)
+      vbox.pack_start(hbox, :expand => false, :fill => false, :padding => 0)
 
       # Create the first entry
       entry = Gtk::Entry.new
-      hbox.pack_start(entry, true, true, 0)
+      hbox.pack_start(entry, :expand => true, :fill => true, :padding => 0)
 
       # Create the button
-      button = Gtk::Button.new(Gtk::Stock::COPY)
-      hbox.pack_start(button, false, false, 0)
+      button = Gtk::Button.new(:stock_id => :copy)
+      hbox.pack_start(button, :expand => false, :fill => false, :padding => 0)
       button.signal_connect('clicked', entry) do |w, e|
         clipboard = e.get_clipboard(Gdk::Selection::CLIPBOARD)
         clipboard.text = e.text
       end
 
       label = Gtk::Label.new(%Q["Paste" will paste the text from the clipboard to the entry])
-      vbox.pack_start(label, false, false, 0)
+      vbox.pack_start(label, :expand => false, :fill => false, :padding => 0)
 
-      hbox = Gtk::HBox.new(false, 4)
+      hbox = Gtk::Box.new(:horizontal, 4)
       hbox.border_width = 8
-      vbox.pack_start(hbox, false, false, 0)
+      vbox.pack_start(hbox, :expand => false, :fill => false, :padding => 0)
 
       # Create the second entry
       entry = Gtk::Entry.new
-      hbox.pack_start(entry, true, true, 0)
+      hbox.pack_start(entry, :expand => true, :fill => true, :padding => 0)
 
       # Create the button
-      button = Gtk::Button.new(Gtk::Stock::PASTE)
-      hbox.pack_start(button, false, false, 0)
+      button = Gtk::Button.new(:stock_id => :paste)
+      hbox.pack_start(button, :expand => false, :fill => false, :padding => 0)
       button.signal_connect('clicked', entry) do |w, e|
         clipboard = e.get_clipboard(Gdk::Selection::CLIPBOARD)
         clipboard.request_text do |board, text, data|

data/sample/gtk-demo/colorsel.rb

@@ -25,8 +25,8 @@ module Demo
 
       ## Create the color swatch area
       @frame = Gtk::Frame.new
-      @frame.set_shadow_type(Gtk::SHADOW_IN)
-      vbox.pack_start(@frame, true, true, 0)
+      @frame.set_shadow_type(:in)
+      vbox.pack_start(@frame, :expand => true, :fill => true, :padding => 0)
 
       @da = Gtk::DrawingArea.new
       
@@ -53,7 +53,7 @@ module Demo
       button = Gtk::Button.new('_Change the above color', true)
       alignment.add(button)
 
-      vbox.pack_start(alignment, false, false, 0)
+      vbox.pack_start(alignment, :expand => false, :fill => false, :padding => 0)
 
       button.signal_connect('clicked') do
 	change_color_callback

data/sample/gtk-demo/common.rb

@@ -23,7 +23,7 @@ module Demo
 
   class BasicWindow < Gtk::Window
     def initialize(title = nil)
-      super(Gtk::Window::TOPLEVEL)
+      super(:toplevel)
       if title
 	set_title("#{title} in Ruby/GTK")
       end

data/sample/gtk-demo/dialog.rb

@@ -26,32 +26,32 @@ module Demo
       frame.add(vbox)
       
       # Standard message dialog
-      hbox = Gtk::HBox.new(false, 0)
-      vbox.pack_start(hbox, false, false, 0)
+      hbox = Gtk::Box.new(:horizontal, 0)
+      vbox.pack_start(hbox, :expand => false, :fill => false, :padding => 0)
       button = Gtk::Button.new('_Message Dialog', true)
       button.signal_connect('clicked') do
 	message_dialog_clicked
       end
-      hbox.pack_start(button, false, false, 0)
+      hbox.pack_start(button, :expand => false, :fill => false, :padding => 0)
 
-      vbox.pack_start(Gtk::HSeparator.new, false, false, 0)
+      vbox.pack_start(Gtk::HSeparator.new, :expand => false, :fill => false, :padding => 0)
 
       # Interactive dialog
-      hbox = Gtk::HBox.new(false, 8)
-      vbox.pack_start(hbox, false, false, 0)
+      hbox = Gtk::Box.new(:horizontal, 8)
+      vbox.pack_start(hbox, :expand => false, :fill => false, :padding => 0)
       vbox2 = Gtk::VBox.new(false, 0)
 
       button = Gtk::Button.new('_Interactive Dialog')
       button.signal_connect('clicked') do
 	interactive_dialog_clicked
       end
-      hbox.pack_start(vbox2, false, false, 0)
-      vbox2.pack_start(button, false, false, 0)
+      hbox.pack_start(vbox2, :expand => false, :fill => false, :padding => 0)
+      vbox2.pack_start(button, :expand => false, :fill => false, :padding => 0)
 
       table = Gtk::Table.new(2, 2, false)
       table.set_row_spacings(4)
       table.set_column_spacings(4)
-      hbox.pack_start(table, false, false, 0)
+      hbox.pack_start(table, :expand => false, :fill => false, :padding => 0)
 
       label = Gtk::Label.new('_Entry 1', true)
       table.attach_defaults(label, 0, 1, 0, 1)
@@ -95,17 +95,17 @@ EOS
 			       ["_Non-stock Button", Gtk::Dialog::RESPONSE_CANCEL]
 			       )
 
-      hbox = Gtk::HBox.new(false, 0)
+      hbox = Gtk::Box.new(:horizontal, 0)
       hbox.set_border_width(8)
-      dialog.vbox.pack_start(hbox, false, false, 0)
+      dialog.vbox.pack_start(hbox, :expand => false, :fill => false, :padding => 0)
 
       stock = Gtk::Image.new(Gtk::Stock::DIALOG_QUESTION, Gtk::IconSize::DIALOG)
-      hbox.pack_start(stock, false, false, 0)
+      hbox.pack_start(stock, :expand => false, :fill => false, :padding => 0)
 
       table = Gtk::Table.new(2, 2, false)
       table.set_row_spacings(4)
       table.set_column_spacings(4)
-      hbox.pack_start(table, true, true, 0)
+      hbox.pack_start(table, :expand => true, :fill => true, :padding => 0)
       label = Gtk::Label.new('_Entry 1', true)
       table.attach_defaults(label,
 			    0, 1, 0, 1)

data/sample/gtk-demo/drawingarea.rb

@@ -37,11 +37,11 @@ module Demo
       ## Create the checkerboard area
       label = Gtk::Label.new
       label.set_markup('<u>Checkerboard pattern</u>')
-      vbox.pack_start(label, false, false, 0)
+      vbox.pack_start(label, :expand => false, :fill => false, :padding => 0)
       
       frame = Gtk::Frame.new
-      frame.shadow_type = Gtk::SHADOW_IN
-      vbox.pack_start(frame, true, true, 0)
+      frame.shadow_type = :in
+      vbox.pack_start(frame, :expand => true, :fill => true, :padding => 0)
       
       da = Gtk::DrawingArea.new
       # set a minimum size
@@ -56,11 +56,11 @@ module Demo
       ## Create the scribble area
       label = Gtk::Label.new
       label.set_markup('<u>Scribble area</u>')
-      vbox.pack_start(label, false, false, 0)
+      vbox.pack_start(label, :expand => false, :fill => false, :padding => 0)
       
       frame = Gtk::Frame.new
-      frame.shadow_type = Gtk::SHADOW_IN
-      vbox.pack_start(frame, true, true, 0)
+      frame.shadow_type = :in
+      vbox.pack_start(frame, :expand => true, :fill => true, :padding => 0)
       
       da = Gtk::DrawingArea.new
       # set a minimum size

data/sample/gtk-demo/editable_cells.rb

@@ -24,12 +24,12 @@ module Demo
       add(vbox)
 
       vbox.pack_start(Gtk::Label.new('Shopping list (you can edit the cells!)'),
-		      false, false, 0)
+		      :expand => false, :fill => false, :padding => 0)
 
       sw = Gtk::ScrolledWindow.new
       sw.shadow_type = Gtk::SHADOW_ETCHED_IN
-      sw.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC)
-      vbox.pack_start(sw, true, true, 0)
+      sw.set_policy(:automatic, :automatic)
+      vbox.pack_start(sw, :expand => true, :fill => true, :padding => 0)
 
       # create model
       model = create_model
@@ -44,20 +44,21 @@ module Demo
       sw.add(treeview)
 
       # some buttons
-      hbox = Gtk::HBox.new(true, 4)
-      vbox.pack_start(hbox, false, false, 0)
+      hbox = Gtk::Box.new(:horizontal, 4)
+      hbox.homogeneous = true
+      vbox.pack_start(hbox, :expand => false, :fill => false, :padding => 0)
 
       button = Gtk::Button.new('Add item')
       button.signal_connect('clicked') do
 	add_item(model)
       end
-      hbox.pack_start(button, true, true, 0)
+      hbox.pack_start(button, :expand => true, :fill => true, :padding => 0)
 
       button = Gtk::Button.new('Remove item')
       button.signal_connect('clicked') do
 	remove_item(treeview)
       end
-      hbox.pack_start(button, true, true, 0)
+      hbox.pack_start(button, :expand => true, :fill => true, :padding => 0)
 
       set_default_size(320, 200)
     end

data/sample/gtk-demo/entry_completion.rb

@@ -25,16 +25,16 @@ module Demo
       end
 
       vbox = Gtk::VBox.new(false, 5)
-      self.vbox.pack_start(vbox, true, true)
+      self.vbox.pack_start(vbox, :expand => true, :fill => true)
       vbox.border_width = 5
 
       label = Gtk::Label.new
       label.markup = 'Completion demo, try writing <b>total</b> or <b>gnome</b> for example'
-      vbox.pack_start(label, false, false)
+      vbox.pack_start(label, :expand => false, :fill => false)
 
       # Create our entry
       entry = Gtk::Entry.new
-      vbox.pack_start(entry, false, false)
+      vbox.pack_start(entry, :expand => false, :fill => false)
 
       # Create the completion object
       completion = Gtk::EntryCompletion.new

data/sample/gtk-demo/expander.rb

@@ -13,26 +13,28 @@ require 'common'
 module Demo
   class Expander < Gtk::Dialog
     def initialize
-      super('GtkExpander',
-	    nil, # parent
-	    0,
-	    [Gtk::Stock::CLOSE, Gtk::Dialog::RESPONSE_NONE])
+      # as opposed to the GTK2 dialog, the buttons have to be enclodes by brackeds
+      # together with their ResponseType AND all groups have to bracketed together
+      super(:title => 'GtkExpander',
+            :parent => nil,
+            :flags => 0,
+            :buttons => [[Gtk::Stock::CLOSE, Gtk::ResponseType::NONE]])
       self.resizable = false
 
       signal_connect('response') do
         self.destroy
       end
 
-      vbox = Gtk::VBox.new(false, 5)
-      self.vbox.pack_start(vbox, true, true)
+      vbox = Gtk::Box.new(:vertical, 5)
+      self.child.pack_start(vbox, :expand => true, :fill => true)
       vbox.border_width = 5
 
       label = Gtk::Label.new('Expander demo. CLick on the triangle for details.')
-      vbox.pack_start(label, false, false)
+      vbox.pack_start(label, :expand => false, :fill => false)
 
       # Create the expander
       expander = Gtk::Expander.new('Details')
-      vbox.pack_start(expander, false, false)
+      vbox.pack_start(expander, :expand => false, :fill => false)
 
       expander.add(Gtk::Label.new('Details can be shown or hidden.'))
     end

data/sample/gtk-demo/hypertext.rb

@@ -27,7 +27,7 @@ module Demo
 
       view = Gtk::TextView.new
 
-      view.wrap_mode = Gtk::TextTag::WRAP_WORD
+      view.wrap_mode = :word
 
       view.signal_connect('key-press-event') do |*args|
         key_press_event(*args)
@@ -45,8 +45,8 @@ module Demo
       buffer = view.buffer
 
       sw = Gtk::ScrolledWindow.new
-      sw.set_policy(Gtk::POLICY_AUTOMATIC,
-                    Gtk::POLICY_AUTOMATIC)
+      sw.set_policy(:automatic,
+                    :automatic)
 
       add(sw)
       sw.add(view)
@@ -77,7 +77,7 @@ module Demo
       puts
 
       buffer.text = ''
-      iter = buffer.get_iter_at_offset(0)
+      iter = buffer.get_iter_at(:offset => 0)
 
       case page
       when 1

data/sample/gtk-demo/iconview.rb

@@ -9,7 +9,8 @@ The Gtk::IconView widget is used to display and manipulate icons.
 It uses a Gtk::TreeModel for data storage, so the list store example
 might be helpful.
 =end
-$KCODE="u"
+
+
 require 'common'
 
 module Demo
@@ -19,19 +20,19 @@ module Demo
     def fill_store
       @store.clear
       Dir.glob(File.join(@parent, "*")).each do |path|
-	is_dir = FileTest.directory?(path)
-	iter = @store.append
+        is_dir = FileTest.directory?(path)
+        iter = @store.append
         # set COL_DISPLAY_NAME first because changing an iter will trigger the
         # sort function; if we set something else first, the value of
         # COL_DISPLAY_NAME for this row will be "nil" and the sort function will fail
-puts path
+#puts path
 #puts GLib.convert(GLib.filename_to_utf8(path), "Shift_JIS", "UTF-8")
 #puts File.basename(GLib.convert(GLib.filename_to_utf8(path), "Shift_JIS", "UTF-8"))
 #        iter[COL_DISPLAY_NAME] = File.basename(GLib.filename_to_utf8(path))
         iter[COL_DISPLAY_NAME] = GLib.filename_to_utf8(path)
-	iter[COL_PATH] = path
-	iter[COL_IS_DIR] = is_dir
-	iter[COL_PIXBUF] = is_dir ? @folder_pixbuf : @file_pixbuf
+        iter[COL_PATH] = path
+        iter[COL_IS_DIR] = is_dir
+        iter[COL_PIXBUF] = is_dir ? @folder_pixbuf : @file_pixbuf
       end
     end
 
@@ -53,53 +54,53 @@ puts path
         end
       end
       @store.set_sort_column_id(Gtk::TreeSortable::DEFAULT_SORT_COLUMN_ID,
-				Gtk::SORT_ASCENDING)
+                                Gtk::SortType::ASCENDING)
 
       fill_store
       set_default_size(650, 400)
       set_border_width(8)
 
-      vbox = Gtk::VBox.new(false, 0)
+      vbox = Gtk::Box.new(:vertical)
       add(vbox)
 
       toolbar = Gtk::Toolbar.new
-      vbox.pack_start(toolbar, false, false, 0)
+      vbox.pack_start(toolbar, :expand => false, :fill => false, :padding => 0)
 
-      up_button = Gtk::ToolButton.new(Gtk::Stock::GO_UP)
+      up_button = Gtk::ToolButton.new(:stock_id => :go_up)
       up_button.important = true
       up_button.sensitive = false
-      toolbar.insert(-1, up_button)
+      toolbar.insert(up_button, -1)
       up_button.signal_connect("clicked") do
-	@parent = File.dirname(@parent)
-	fill_store
-	up_button.sensitive = @parent != "/"
+        @parent = File.dirname(@parent)
+        fill_store
+        up_button.sensitive = @parent != "/"
       end
 
-      home_button = Gtk::ToolButton.new(Gtk::Stock::HOME)
+      home_button = Gtk::ToolButton.new(:stock_id => :home)
       home_button.important = true
-      toolbar.insert(-1, home_button)
+      toolbar.insert(home_button, -1)
       home_button.signal_connect("clicked") do
-	@parent = GLib.home_dir
-	fill_store
-	up_button.sensitive = true
+        @parent = GLib.home_dir
+        fill_store
+        up_button.sensitive = true
       end
 
       sw = Gtk::ScrolledWindow.new
-      sw.shadow_type = Gtk::SHADOW_ETCHED_IN
-      sw.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC)
-      vbox.pack_start(sw, true, true, 0)
+      sw.shadow_type = :etched_in
+      sw.set_policy(:automatic, :automatic)
+      vbox.pack_start(sw, :expand => true, :fill => true, :padding => 0)
 
       iconview = Gtk::IconView.new(@store)
-      iconview.selection_mode = Gtk::SELECTION_MULTIPLE
+      iconview.selection_mode = :multiple
       iconview.text_column = COL_DISPLAY_NAME
       iconview.pixbuf_column = COL_PIXBUF
       iconview.signal_connect("item_activated") do |iview, path|
-	iter = @store.get_iter(path)
-	if iter[COL_DISPLAY_NAME]
-	  @parent = iter[COL_PATH]
-	  fill_store
-	  up_button.sensitive = true
-	end
+        iter = @store.get_iter(path)
+        if iter[COL_DISPLAY_NAME]
+          @parent = iter[COL_PATH]
+          fill_store
+          up_button.sensitive = true
+        end
       end
       sw.add(iconview)
       iconview.grab_focus

data/sample/gtk-demo/images.rb

@@ -38,16 +38,16 @@ module Demo
 
       label = Gtk::Label.new
       label.set_markup('<u>Image loaded from a file</u>')
-      vbox.pack_start(label, false, false, 0)
+      vbox.pack_start(label, :expand => false, :fill => false, :padding => 0)
       
       frame = Gtk::Frame.new
-      frame.shadow_type = Gtk::SHADOW_IN
+      frame.shadow_type = :in
       
       # The alignment keeps the frame from growing when users resize
       # the window
       align = Gtk::Alignment.new(0.5, 0.5, 0, 0)
       align.add(frame)
-      vbox.pack_start(align, false, false, 0)
+      vbox.pack_start(align, :expand => false, :fill => false, :padding => 0)
 
       # demo_find_file looks in the the current directory first,
       # so you can run gtk-demo without installing GTK, then looks
@@ -81,16 +81,16 @@ module Demo
       # Animation
       label = Gtk::Label.new
       label.set_markup('<u>Animation loaded from a file</u>')
-      vbox.pack_start(label, false, false, 0)
+      vbox.pack_start(label, :expand => false, :fill => false, :padding => 0)
       
       frame = Gtk::Frame.new
-      frame.shadow_type = Gtk::SHADOW_IN
+      frame.shadow_type = :in
       
       # The alignment keeps the frame from growing when users resize
       # the window
       align = Gtk::Alignment.new(0.5, 0.5, 0, 0)
       align.add(frame)
-      vbox.pack_start(align, false, false, 0)
+      vbox.pack_start(align, :expand => false, :fill => false, :padding => 0)
 
       filename = Demo.find_file('floppybuddy.gif')
       image = Gtk::Image.new(filename)
@@ -100,16 +100,16 @@ module Demo
       # Progressive
       label = Gtk::Label.new
       label.set_markup('<u>Progressive image loading</u>')
-      vbox.pack_start(label, false, false, 0)
+      vbox.pack_start(label, :expand => false, :fill => false, :padding => 0)
       
       frame = Gtk::Frame.new(nil)
-      frame.shadow_type = Gtk::SHADOW_IN
+      frame.shadow_type = :in
       
       # The alignment keeps the frame from growing when users resize
       # the window
       align = Gtk::Alignment.new(0.5, 0.5, 0, 0)
       align.add(frame)
-      vbox.pack_start(align, false, false, 0)
+      vbox.pack_start(align, :expand => false, :fill => false, :padding => 0)
 
       # Create an empty image for now; the progressive loader
       # will create the pixbuf and fill it in.
@@ -120,7 +120,7 @@ module Demo
 
       # Sensitivity control
       button = Gtk::ToggleButton.new('_Insensitive', true)
-      vbox.pack_start(button, false, false, 0)
+      vbox.pack_start(button, :expand => false, :fill => false, :padding => 0)
 
       button.signal_connect('toggled') do |widget|
 	vbox.children.each do |widget|