gtk2 2.0.2 → 2.0.3

data/ext/gtk2/rbgtkwindow.c

@@ -178,7 +178,6 @@ rg_set_default(VALUE self, VALUE win)
     return self;
 }
 
-#if GTK_CHECK_VERSION(2,8,0)
 static VALUE
 rg_present(int argc, VALUE *argv, VALUE self)
 {
@@ -190,14 +189,6 @@ rg_present(int argc, VALUE *argv, VALUE self)
     }
     return self;
 }
-#else
-static VALUE
-gwin_present(VALUE self)
-{
-    gtk_window_present(_SELF(self));
-    return self;
-}
-#endif
 
 static VALUE
 rg_iconify(VALUE self)
@@ -241,7 +232,6 @@ rg_unmaximize(VALUE self)
     return self;
 }
 
-#if GTK_CHECK_VERSION(2,2,0) 
 static VALUE
 rg_fullscreen(VALUE self)
 {
@@ -254,8 +244,7 @@ rg_unfullscreen(VALUE self)
     gtk_window_unfullscreen(_SELF(self));
     return self;
 }
-#endif
-#if GTK_CHECK_VERSION(2,4,0)
+
 static VALUE
 rg_set_keep_above(VALUE self, VALUE setting)
 {
@@ -268,7 +257,6 @@ rg_set_keep_below(VALUE self, VALUE setting)
     gtk_window_set_keep_below(_SELF(self), RVAL2CBOOL(setting));
     return self;
 }
-#endif
 
 static VALUE
 rg_begin_resize_drag(VALUE self, VALUE edge, VALUE button, VALUE root_x, VALUE root_y, VALUE timestamp)
@@ -372,13 +360,11 @@ rg_size(VALUE self)
     return rb_ary_new3(2, INT2NUM(width), INT2NUM(height));
 }
 
-#if GTK_CHECK_VERSION(2,10,0)
 static VALUE
 rg_group(VALUE self)
 {
     return GOBJ2RVAL(gtk_window_get_group(_SELF(self)));
 }
-#endif
 
 static VALUE
 rg_move(VALUE self, VALUE x, VALUE y)
@@ -419,7 +405,6 @@ rg_s_set_default_icon_list(G_GNUC_UNUSED VALUE self, VALUE rblist)
     return rblist;
 }
 
-#if GTK_CHECK_VERSION(2,2,0)
 static VALUE
 rg_s_set_default_icon(VALUE self, VALUE icon_or_filename)
 {
@@ -429,40 +414,28 @@ rg_s_set_default_icon(VALUE self, VALUE icon_or_filename)
         if (! ret)
             RAISE_GERROR(err);
     } else {
-#if GTK_CHECK_VERSION(2,4,0)
         gtk_window_set_default_icon(GDK_PIXBUF(RVAL2GOBJ(icon_or_filename)));
-#else
-        rb_raise(rb_eArgError, "Invalid argument: %s, or you may need to use GTK+-2.4.x", 
-                 rb_class2name(CLASS_OF(icon_or_filename)));
-#endif
     }
     return self;
 }
-#endif
 
-#if GTK_CHECK_VERSION(2,6,0)
 static VALUE
 rg_s_set_default_icon_name(VALUE self, VALUE name)
 {
     gtk_window_set_default_icon_name(RVAL2CSTR(name));
     return self;
 }
-#endif
 
 static VALUE
 gwin_set_icon(VALUE self, VALUE icon_or_filename)
 {
     if (TYPE(icon_or_filename) == T_STRING){
-#if GTK_CHECK_VERSION(2,2,0)
         GError* err;
         gboolean ret = gtk_window_set_icon_from_file(_SELF(self),
                                                      RVAL2CSTR(icon_or_filename), &err);
         if (! ret)
             RAISE_GERROR(err);
-#else
-        rb_raise(rb_eArgError, "Invalid argument: %s, or you may need to use GTK+-2.4.x", 
-                 rb_class2name(CLASS_OF(icon_or_filename)));
-#endif
+
     } else {
         gtk_window_set_icon(_SELF(self), GDK_PIXBUF(RVAL2GOBJ(icon_or_filename)));
     }
@@ -483,14 +456,12 @@ rg_set_icon_list(VALUE self, VALUE rblist)
     return rblist;
 }
 
-#if GTK_CHECK_VERSION(2,2,0)
 static VALUE
 rg_s_set_auto_startup_notification(VALUE self, VALUE setting)
 {
     gtk_window_set_auto_startup_notification(RVAL2CBOOL(setting));
     return self;
 }
-#endif
 
 /* They are not public methods.
 static VALUE
@@ -556,25 +527,17 @@ Init_gtk_window(VALUE mGtk)
     RG_DEF_METHOD(focus, 0);
     RG_DEF_METHOD(set_focus, 1);
     RG_DEF_METHOD(set_default, 1);
-#if GTK_CHECK_VERSION(2,8,0)
     RG_DEF_METHOD(present, -1);
-#else
-    RG_DEF_METHOD(present, 0);
-#endif
     RG_DEF_METHOD(iconify, 0);
     RG_DEF_METHOD(deiconify, 0);
     RG_DEF_METHOD(stick, 0);
     RG_DEF_METHOD(unstick, 0);
     RG_DEF_METHOD(maximize, 0);
     RG_DEF_METHOD(unmaximize, 0);
-#if GTK_CHECK_VERSION(2,2,0)
     RG_DEF_METHOD(fullscreen, 0);
     RG_DEF_METHOD(unfullscreen, 0);
-#endif
-#if GTK_CHECK_VERSION(2,4,0)
     RG_DEF_METHOD(set_keep_above, 1);
     RG_DEF_METHOD(set_keep_below, 1);
-#endif
     RG_DEF_METHOD(begin_resize_drag, 5);
     RG_DEF_METHOD(begin_move_drag, 4);
     RG_DEF_METHOD(set_frame_dimensions, 4);
@@ -588,25 +551,17 @@ Init_gtk_window(VALUE mGtk)
     RG_DEF_METHOD(mnemonic_modifier, 0);
     RG_DEF_METHOD(position, 0);
     RG_DEF_METHOD(size, 0);
-#if GTK_CHECK_VERSION(2,10,0)
     RG_DEF_METHOD(group, 0);
-#endif
     RG_DEF_METHOD(move, 2);
     RG_DEF_METHOD(parse_geometry, 1);
     RG_DEF_METHOD(reshow_with_initial_size, 0);
     RG_DEF_METHOD(resize, 2);
     RG_DEF_SMETHOD(set_default_icon_list, 1);
-#if GTK_CHECK_VERSION(2,2,0)
     RG_DEF_SMETHOD(set_default_icon, 1);
-#endif
-#if GTK_CHECK_VERSION(2,6,0)
     RG_DEF_SMETHOD(set_default_icon_name, 1);
-#endif
     G_REPLACE_SET_PROPERTY(RG_TARGET_NAMESPACE, "icon", gwin_set_icon, 1);
     RG_DEF_METHOD(set_icon_list, 1);
-#if GTK_CHECK_VERSION(2,2,0)
     RG_DEF_SMETHOD(set_auto_startup_notification, 1);
-#endif
 
 /*
     RG_DEF_METHOD(decorated_window_init, 0);

data/sample/gtk-demo/common.rb

@@ -11,7 +11,12 @@ require 'gtk2'
 
 module Demo
   def self.find_file(basename)
-    %w(. /usr/share/gtk-2.0/demo /usr/local/share/gtk-2.0/demo/).each do |dirname|
+    file_load_paths = [
+      File.dirname(__FILE__),
+      "/usr/share/gtk-2.0/demo",
+      "/usr/local/share/gtk-2.0/demo",
+    ]
+    file_load_paths.each do |dirname|
       path = File.join(dirname, basename)
       if File.exist?(path)
 	return path

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|
@@ -51,10 +51,10 @@ module Demo
       hbox.pack_start(notebook, true, true, 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'})
@@ -65,9 +65,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
@@ -95,21 +95,25 @@ 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
     end
 
     def generate_index
+      base_dir = File.dirname(__FILE__)
       # Target scripts
-      scripts = Dir.glob('*.rb') - %w(common.rb main.rb)
+      scripts = Dir.glob(File.join(base_dir, '*.rb'))
 
       # Generate index tree
       children = {}
       index = []
 
+      not_script_base_names = %w(common.rb main.rb)
       scripts.each do |fn|
+        base_name = File.basename(fn)
+        next if not_script_base_names.include?(base_name)
         title, klass, depend = script_info(fn)
 
         if depend and not Gtk.const_defined?(depend)
@@ -169,7 +173,7 @@ module Demo
       cell = Gtk::CellRendererText.new
       cell.style = Pango::FontDescription::STYLE_ITALIC
       column = Gtk::TreeViewColumn.new("Widget (double click for demo)", cell,
-                                      {
+                                       {
                                          'text' => TITLE_COLUMN,
                                          'style_set' => ITALIC_COLUMN,
                                        })
@@ -177,8 +181,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)
@@ -190,13 +194,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
@@ -212,21 +216,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(Gtk::POLICY_AUTOMATIC,
-				 Gtk::POLICY_AUTOMATIC)
+                                 Gtk::POLICY_AUTOMATIC)
       scrolled_window.set_shadow_type(Gtk::SHADOW_IN)
 
       text_view = Gtk::TextView.new
@@ -238,35 +242,35 @@ module Demo
       scrolled_window.add(text_view)
 
       if is_source
-	font_desc = Pango::FontDescription.new('Monospace 12')
-	text_view.modify_font(font_desc)
+        font_desc = Pango::FontDescription.new('Monospace 12')
+        text_view.modify_font(font_desc)
 
-	text_view.set_wrap_mode(Gtk::TextTag::WRAP_NONE)
+        text_view.set_wrap_mode(Gtk::TextTag::WRAP_NONE)
       else
-	text_view.set_wrap_mode(Gtk::TextTag::WRAP_WORD)
-	text_view.set_pixels_above_lines(2)
-	text_view.set_pixels_below_lines(2)
+        text_view.set_wrap_mode(Gtk::TextTag::WRAP_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)
@@ -274,43 +278,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
@@ -325,30 +329,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
@@ -365,9 +369,9 @@ if target
       window.show_all
 
       class << window
-	def quit
-	  Gtk.main_quit
-	end
+        def quit
+          Gtk.main_quit
+        end
       end
 
       break