gtk3 2.2.0 → 2.2.1

data/ext/gtk3/rbgtk3private.h

@@ -35,7 +35,6 @@
 #include <cairo-gobject.h>
 #include <rbpango.h>
 #include <rbgdk-pixbuf.h>
-#include <rbgdk3.h>
 #include "rbgtk3.h"
 #include "rbgtk3util.h"
 
@@ -242,6 +241,7 @@ G_GNUC_INTERNAL void Init_gtk_spin_button(VALUE mGtk);
 G_GNUC_INTERNAL void Init_gtk_spinner(VALUE mGtk);
 #if GTK_CHECK_VERSION(3, 10, 0)
    G_GNUC_INTERNAL void Init_gtk_stack(VALUE mGtk);
+   G_GNUC_INTERNAL void Init_gtk_stack_switcher(VALUE mGtk);
 #endif
 G_GNUC_INTERNAL void Init_gtk_statusbar(VALUE mGtk);
 G_GNUC_INTERNAL void Init_gtk_status_icon(VALUE mGtk);

data/lib/gtk3.rb

@@ -7,4 +7,5 @@
 require 'gtk3/base'
 require 'gtk3/deprecated'
 
+Gdk.init if Gdk.respond_to?(:init)
 Gtk.init

data/sample/gtk-demo/cairo-arc-negative.rb

@@ -25,7 +25,7 @@ module Demo
     def draw(cr)
       cr.arc_negative(CENTER_X, CENTER_Y, RADIUS, ANGLE1, ANGLE2)
       cr.stroke
-      
+
       # draw helping lines
       cr.set_source_rgba(1, 0.2, 0.2, 0.6)
       cr.arc(CENTER_X, CENTER_Y, 0.05, 0, 2 * Math::PI)

data/sample/gtk-demo/cairo-arc.rb

@@ -25,7 +25,7 @@ module Demo
     def draw(cr)
       cr.arc(CENTER_X, CENTER_Y, RADIUS, ANGLE1, ANGLE2)
       cr.stroke
-      
+
       # draw helping lines
       cr.set_source_rgba(1, 0.2, 0.2, 0.6)
       cr.arc(CENTER_X, CENTER_Y, 0.05, 0, 2 * Math::PI)

data/sample/gtk-demo/cairo-clip-image.rb

@@ -20,16 +20,16 @@ module Demo
       cr.save do
         cr.arc(0.5, 0.5, 0.4, 0, 2 * Math::PI)
         cr.clip
-        
+
         cr.new_path
-        
+
         loader = Gdk::PixbufLoader.new
         File.open("background.jpg", "rb") do |f|
           loader.last_write(f.read)
         end
         pixbuf = loader.pixbuf
         cr.scale(1.0 / pixbuf.width, 1.0 / pixbuf.height)
-        
+
         cr.set_source_pixbuf(pixbuf, 0, 0)
         cr.paint
       end
@@ -37,12 +37,12 @@ module Demo
       cr.save do
         cr.arc(0.5, 0.5, 0.3, 0, 2 * Math::PI)
         cr.clip
-        
+
         cr.new_path
-        
+
         image = Cairo::ImageSurface.from_png("ruby-gnome2-logo.png")
         cr.scale(1.0 / image.width, 1.0 / image.height)
-        
+
         cr.set_source(image, 0, 0)
         cr.paint
       end

data/sample/gtk-demo/cairo-clip-rectangle.rb

@@ -24,9 +24,9 @@ module Demo
       cr.line_to(0.75, 0.25)
       cr.line_to(0.25, 0.25)
       cr.close_path
-      
+
       cr.clip
-      
+
       cr.move_to(0, 0)
       cr.line_to(1, 1)
       cr.stroke

data/sample/gtk-demo/cairo-curve-rectangle.rb

@@ -28,7 +28,7 @@ module Demo
 
     def draw(cr)
       return if (RECT_WIDTH <= 0 || RECT_HEIGHT <= 0)
-        
+
       if (RECT_WIDTH / 2 < RADIUS)
         if (RECT_HEIGHT / 2 < RADIUS)
           cr.move_to(X0, (Y0 + Y1) / 2)
@@ -64,7 +64,7 @@ module Demo
           cr.curve_to(X0, Y1, X0, Y1, X0, Y1- RADIUS)
         end
       end
-      
+
       cr.close_path
 
       cr.set_source_rgba(0.5,0.5,1)

data/sample/gtk-demo/cairo-curve-to.rb

@@ -28,9 +28,9 @@ module Demo
     def draw(cr)
       cr.move_to(X, Y)
       cr.curve_to(X1, Y1, X2, Y2, X3, Y3)
-      
+
       cr.stroke
-      
+
       cr.set_source_rgba(1, 0.2, 0.2, 0.6)
       cr.set_line_width(0.03)
       cr.move_to(X, Y)

data/sample/gtk-demo/cairo-dash.rb

@@ -32,7 +32,7 @@ module Demo
       cr.line_to(0.9, 0.9)
       cr.rel_line_to(-0.4, 0.0)
       cr.curve_to(0.2, 0.9, 0.2, 0.5, 0.5, 0.5)
-      
+
       cr.stroke
     end
   end

data/sample/gtk-demo/cairo-fill-and-stroke.rb

@@ -22,7 +22,7 @@ module Demo
       cr.rel_line_to(-0.4, 0.0)
       cr.curve_to(0.2, 0.9, 0.2, 0.5, 0.5, 0.5)
       cr.close_path
-      
+
       cr.set_source_rgba(0, 0, 1)
       cr.fill_preserve
       cr.set_source_rgba(0, 0, 0)

data/sample/gtk-demo/cairo-fill-and-stroke2.rb

@@ -22,13 +22,13 @@ module Demo
       cr.rel_line_to(-0.4, 0.0)
       cr.curve_to(0.2, 0.9, 0.2, 0.5, 0.5, 0.5)
       cr.close_path
-      
+
       cr.move_to(0.25, 0.1)
       cr.rel_line_to(0.2, 0.2)
       cr.rel_line_to(-0.2, 0.2)
       cr.rel_line_to(-0.2, -0.2)
       cr.close_path
-      
+
       cr.set_source_rgba(0, 0, 1)
       cr.fill_preserve
       cr.set_source_rgba(0, 0, 0)

data/sample/gtk-demo/cairo-gradient.rb

@@ -23,7 +23,7 @@ module Demo
       cr.rectangle(0, 0, 1, 1)
       cr.set_source(pat)
       cr.fill
-      
+
       pat = Cairo::RadialPattern.new(0.45, 0.4, 0.1, 0.4, 0.4, 0.5)
       pat.add_color_stop_rgba(0, 1, 1, 1, 0.8)
       pat.add_color_stop_rgba(1, 0, 0, 0)

data/sample/gtk-demo/cairo-image-pattern.rb

@@ -18,20 +18,20 @@ module Demo
 
     def draw(cr)
       image = Cairo::ImageSurface.from_png("ruby-gnome2-logo.png")
-      
+
       pattern = Cairo::SurfacePattern.new(image)
       pattern.set_extend(Cairo::EXTEND_REPEAT)
-      
+
       cr.translate(0.5, 0.5)
       cr.rotate(Math::PI / 4)
       cr.scale(1 / Math.sqrt(2), 1 / Math.sqrt(2))
       cr.translate(-0.5, -0.5)
-      
+
       matrix = Cairo::Matrix.scale(image.width * 5, image.height * 5)
       pattern.set_matrix(matrix)
-      
+
       cr.set_source(pattern)
-      
+
       cr.rectangle(0, 0, 1.0, 1.0)
       cr.fill
     end

data/sample/gtk-demo/cairo-image.rb

@@ -23,24 +23,24 @@ module Demo
           loader.last_write(f.read)
         end
         pixbuf = loader.pixbuf
-        
+
         cr.translate(0.5, 0.5)
         cr.rotate(45 * Math::PI / 180)
         cr.scale(1.0 / pixbuf.width, 1.0 / pixbuf.height)
         cr.translate(-0.5 * pixbuf.width, -0.5 * pixbuf.height)
-        
+
         cr.set_source_pixbuf(pixbuf, 0, 0)
         cr.paint
       end
 
       cr.save do
         image = Cairo::ImageSurface.from_png("ruby-gnome2-logo.png")
-        
+
         cr.translate(0.5, 0.5)
         cr.rotate(60 * Math::PI / 180)
         cr.scale(0.8 / image.width, 0.8 / image.height)
         cr.translate(-0.5 * image.width, -0.5 * image.height)
-        
+
         cr.set_source(image, 0, 0)
         cr.paint
       end

data/sample/gtk-demo/cairo-line-cap.rb

@@ -18,35 +18,35 @@ module Demo
 
     def draw(cr)
       cr.set_line_width(0.12)
-      
+
       cr.set_line_cap(Cairo::LINE_CAP_BUTT) # default
       cr.move_to(0.25, 0.2)
       cr.line_to(0.25, 0.8)
       cr.stroke
-      
+
       cr.set_line_cap(Cairo::LINE_CAP_ROUND)
       cr.move_to(0.5, 0.2)
       cr.line_to(0.5, 0.8)
       cr.stroke
-      
+
       cr.set_line_cap(Cairo::LINE_CAP_SQUARE)
       cr.move_to(0.75, 0.2)
       cr.line_to(0.75, 0.8)
       cr.stroke
-      
+
       # draw helping lines
       cr.set_source_rgba(1, 0.2, 0.2)
       cr.set_line_width(0.01)
-      
+
       cr.move_to(0.25, 0.2)
       cr.line_to(0.25, 0.8)
-      
+
       cr.move_to(0.5, 0.2)
       cr.line_to(0.5, 0.8)
-      
+
       cr.move_to(0.75, 0.2)
       cr.line_to(0.75, 0.8)
-      
+
       cr.stroke
     end
   end

data/sample/gtk-demo/cairo-line-join.rb

@@ -18,19 +18,19 @@ module Demo
 
     def draw(cr)
       cr.set_line_width(0.16)
-      
+
       cr.move_to(0.3, 0.33)
       cr.rel_line_to(0.2, -0.2)
       cr.rel_line_to(0.2, 0.2)
       cr.set_line_join(Cairo::LINE_JOIN_MITER) # default
       cr.stroke
-      
+
       cr.move_to(0.3, 0.63)
       cr.rel_line_to(0.2, -0.2)
       cr.rel_line_to(0.2, 0.2)
       cr.set_line_join(Cairo::LINE_JOIN_BEVEL)
       cr.stroke
-      
+
       cr.move_to(0.3, 0.93)
       cr.rel_line_to(0.2, -0.2)
       cr.rel_line_to(0.2, 0.2)

data/sample/gtk-demo/cairo-long-lines.rb

@@ -21,17 +21,17 @@ module Demo
       cr.line_to(0.1, 50)
       cr.set_source_rgba(1, 0, 0)
       cr.stroke
-      
+
       cr.move_to(0.2, -60)
       cr.line_to(0.2, 60)
       cr.set_source_rgba(1, 1, 0)
       cr.stroke
-      
+
       cr.move_to(0.3, -70)
       cr.line_to(0.3, 70)
       cr.set_source_rgba(0, 1, 0)
       cr.stroke
-      
+
       cr.move_to(0.4, -80)
       cr.line_to(0.4, 80)
       cr.set_source_rgba(0, 0, 1)

data/sample/gtk-demo/cairo-pattern-fill.rb

@@ -14,13 +14,13 @@ module Demo
   class CairoPatternFill < CairoWindow
     X_FUZZ = 0.08
     Y_FUZZ = 0.08
-    
+
     X_INNER_RADIUS = 0.3
     Y_INNER_RADIUS = 0.2
-    
+
     X_OUTER_RADIUS = 0.45
     Y_OUTER_RADIUS = 0.35
-    
+
     SPIKES = 10
 
     TEXT = "Ruby!"
@@ -31,31 +31,31 @@ module Demo
 
     def draw(cr)
       srand(45)
-      
+
       cr.set_line_width(0.01)
 
       x = y = nil
       0.step(SPIKES * 2 - 1, 2) do |i|
         x = x_position(i, X_INNER_RADIUS)
         y = y_position(i, Y_INNER_RADIUS)
-        
+
         if (i == 0)
           cr.move_to(x, y)
         else
           cr.line_to(x, y)
         end
-            
+
         i += 1
-            
+
         x = x_position(i, X_OUTER_RADIUS)
         y = y_position(i, Y_OUTER_RADIUS)
-        
+
         cr.line_to(x, y)
       end
 
       cr.close_path
       cr.stroke
-          
+
       cr.select_font_face("Sans",
                           Cairo::FONT_SLANT_NORMAL,
                           Cairo::FONT_WEIGHT_BOLD)
@@ -65,7 +65,7 @@ module Demo
       cr.text_path(TEXT)
       cr.set_source_rgba(1, 0, 0.5)
       cr.fill
-          
+
       cr.set_font_size(0.2)
       extents = cr.text_extents(TEXT)
       x = 0.5 - (extents.width / 2 + extents.x_bearing)
@@ -82,7 +82,7 @@ module Demo
     end
 
     def y_position(i, radius)
-      0.5 + Math.sin(Math::PI * i / SPIKES) * radius + rand * Y_FUZZ      
+      0.5 + Math.sin(Math::PI * i / SPIKES) * radius + rand * Y_FUZZ
     end
   end
 end

data/sample/gtk-demo/cairo-self-intersect.rb

@@ -19,10 +19,10 @@ module Demo
     def draw(cr)
       cr.move_to(0.3, 0.3)
       cr.line_to(0.7, 0.3)
-      
+
       cr.line_to(0.5, 0.3)
       cr.line_to(0.5, 0.7)
-      
+
       cr.set_line_width(0.22)
       cr.set_line_cap(Cairo::LINE_CAP_ROUND)
       cr.set_line_join(Cairo::LINE_JOIN_ROUND)

data/sample/gtk-demo/cairo-text-align-center.rb

@@ -13,7 +13,7 @@ require 'common'
 module Demo
   class CairoTextAlignCenter < CairoWindow
     TEXT = "Ruby"
-    
+
     def initialize
       super('cairo text align center')
     end
@@ -22,15 +22,15 @@ module Demo
       cr.select_font_face("Sans",
                           Cairo::FONT_SLANT_NORMAL,
                           Cairo::FONT_WEIGHT_NORMAL)
-      
+
       cr.set_font_size(0.2)
       extents = cr.text_extents(TEXT)
       x = 0.5 - (extents.width / 2 + extents.x_bearing)
       y = 0.5 - (extents.height / 2 + extents.y_bearing)
-      
+
       cr.move_to(x, y)
       cr.show_text(TEXT)
-      
+
       # draw helping lines
       cr.set_source_rgba(1, 0.2, 0.2, 0.6)
       cr.arc(x, y, 0.05, 0, 2 * Math::PI)

data/sample/gtk-demo/cairo-text-extents.rb

@@ -13,7 +13,7 @@ require 'common'
 module Demo
   class CairoTextExtents < CairoWindow
     TEXT = "Ruby"
-    
+
     def initialize
       super('cairo text')
     end
@@ -22,16 +22,16 @@ module Demo
       cr.select_font_face("Sans",
                               Cairo::FONT_SLANT_NORMAL,
                               Cairo::FONT_WEIGHT_NORMAL)
-      
+
       cr.set_font_size(0.3)
       extents = cr.text_extents(TEXT)
-      
+
       x = 0.1
       y = 0.6
-      
+
       cr.move_to(x, y)
       cr.show_text(TEXT)
-      
+
       # draw helping lines
       cr.set_source_rgba(1, 0.2, 0.2, 0.6)
       cr.arc(x, y, 0.05, 0, 2 * Math::PI)