gtk2 0.90.8-x86-mingw32 → 0.90.9-x86-mingw32

data/ChangeLog

@@ -1,3 +1,25 @@
+2011-06-05  Kouhei Sutou  <kou@cozmixng.org>
+
+	* sample/gtk-demo/cairo-operator.rb
+	(Demo::CairoOperator#operator_selector): support Ruby 1.9.
+	Reported by Jon. Thanks!!!
+
+	* sample/misc/cairo-pong.rb: use Gdk.cairo_available? to check
+	cairo support availability.
+	Reported by Jon. Thanks!!!
+
+2011-05-22  Kouhei Sutou  <kou@cozmixng.org>
+
+	* ext/gtk2/rbgtkwindow.c (gwin_add_accel_group)
+	(gwin_remove_accel_group): add missing reference to accel group.
+	[#3305589]
+	Reported by Piotr Korzuszek. Thanks!!!
+
+2011-03-06  Vincent Carmona
+
+	* sample/misc/bindings.rb: use String#each_line instead of String#each
+	to fix bugs with ruby1.9.
+
 2011-02-28  Vincent Carmona
 
 	* sample/gtk-demo/main.rb: Add gtk-demo directory to $: to fix

data/ext/gtk2/rbgtkwindow.c

@@ -6,7 +6,7 @@
   $Author: ktou $
   $Date: 2007/09/08 12:49:10 $
 
-  Copyright (C) 2002-2006 Ruby-GNOME2 Project Team
+  Copyright (C) 2002-2011 Ruby-GNOME2 Project Team
   Copyright (C) 1998-2000 Yukihiro Matsumoto,
                           Daisuke Kanda,
                           Hiroshi Igarashi
@@ -55,6 +55,7 @@ gwin_add_accel_group(VALUE self, VALUE accel)
 {
     gtk_window_add_accel_group(_SELF(self),
                                GTK_ACCEL_GROUP(RVAL2GOBJ(accel)));
+    G_CHILD_ADD(self, accel);
     return self;
 }
 
@@ -63,6 +64,7 @@ gwin_remove_accel_group(VALUE self, VALUE accel)
 {
     gtk_window_remove_accel_group(_SELF(self),
                                   GTK_ACCEL_GROUP(RVAL2GOBJ(accel)));
+    G_CHILD_REMOVE(self, accel);
     return self;
 }
 

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

@@ -68,7 +68,7 @@ module Demo
         operators << name if /^OPERATOR_/ =~ name
       end
       operators.sort.each_with_index do |name, i|
-        combo.append_text(name)
+        combo.append_text(name.to_s)
         combo.set_active(i) if Cairo.const_get(name) == @operator
       end
 

data/sample/misc/bindings.rb

@@ -48,7 +48,7 @@ class Pager < Gtk::TextView
   end
 
   def load
-    open(@path).read.each do |line|
+    open(@path).read.each_line do |line|
       @buffer.insert_at_cursor(line)
     end
     @buffer.place_cursor(@buffer.start_iter)

data/sample/misc/cairo-pong.rb

@@ -12,7 +12,7 @@
 
 require "gtk2"
 
-unless Gdk::Drawable.instance_methods.include?("create_cairo_context")
+unless Gdk.cairo_available?
   raise "GTK+ 2.8.0 or later and cairo support are required."
 end
 

data/vendor/local/bin/gtk-builder-convert

@@ -146,8 +146,9 @@ def copy_properties(node, props, prop_dict):
 
 class GtkBuilderConverter(object):
 
-    def __init__(self, skip_windows, root):
+    def __init__(self, skip_windows, target_version, root):
         self.skip_windows = skip_windows
+        self.target_version = target_version
         self.root = root
         self.root_objects = []
         self.objects = {}
@@ -295,6 +296,25 @@ class GtkBuilderConverter(object):
                 self._convert_menu(node, popup=True)
         elif klass in WINDOWS and self.skip_windows:
             self._remove_window(node)
+
+        if self.target_version == "3.0":
+            if klass == "GtkComboBoxEntry":
+                node.setAttribute("class","GtkComboBox")
+                prop = self._dom.createElement("property")
+                prop.setAttribute("name", "has-entry")
+                prop.appendChild(self._dom.createTextNode("True"))
+                node.appendChild(prop)
+            elif klass == "GtkDialog":
+                for child in node.childNodes:
+                    if child.nodeType != Node.ELEMENT_NODE:
+                        continue
+                    if child.tagName != 'property':
+                        continue
+                    if (child.getAttribute("name") not in ("has-separator", "has_separator")):
+                        continue;
+                    node.removeChild(child)
+                    break
+
         self._default_widget_converter(node)
 
     def _default_widget_converter(self, node):
@@ -732,7 +752,10 @@ def usage():
 def main(args):
     try:
         opts, args = getopt.getopt(args[1:], "hwr:",
-                                   ["help", "skip-windows", "root="])
+                                   ["help",
+                                    "skip-windows",
+                                    "target-version=",
+                                    "root="])
     except getopt.GetoptError:
         usage()
         return 2
@@ -746,6 +769,7 @@ def main(args):
     skip_windows = False
     split = False
     root = None
+    target_version = "2.0"
     for o, a in opts:
         if o in ("-h", "--help"):
             usage()
@@ -754,8 +778,11 @@ def main(args):
             root = a
         elif o in ("-w", "--skip-windows"):
             skip_windows = True
+        elif o in ("-t", "--target-version"):
+            target_version = a
 
     conv = GtkBuilderConverter(skip_windows=skip_windows,
+                               target_version=target_version,
                                root=root)
     conv.parse_file(input_filename)
 

data/vendor/local/etc/gtk-2.0/gtk.immodules

@@ -1,4 +1,4 @@
 # GTK+ Input Method Modules file
 #
-# ModulesPath = c:\Users\tml\.gtk-2.0\2.10.0\i686-pc-mingw32\immodules;c:\Users\tml\.gtk-2.0\2.10.0\immodules;c:\Users\tml\.gtk-2.0\i686-pc-mingw32\immodules;c:\Users\tml\.gtk-2.0\immodules;c:\devel\target\d7fd1ca0216656a73e6b25377ec11a8c\lib\gtk-2.0\2.10.0\i686-pc-mingw32\immodules;c:\devel\target\d7fd1ca0216656a73e6b25377ec11a8c\lib\gtk-2.0\2.10.0\immodules;c:\devel\target\d7fd1ca0216656a73e6b25377ec11a8c\lib\gtk-2.0\i686-pc-mingw32\immodules;c:\devel\target\d7fd1ca0216656a73e6b25377ec11a8c\lib\gtk-2.0\immodules
+# ModulesPath = c:\Users\tml\.gtk-2.0\2.10.0\i686-pc-mingw32\immodules;c:\Users\tml\.gtk-2.0\2.10.0\immodules;c:\Users\tml\.gtk-2.0\i686-pc-mingw32\immodules;c:\Users\tml\.gtk-2.0\immodules;c:\devel\target\b9c27d8bdadd13a9fcdbaa4f00664a2b\lib\gtk-2.0\2.10.0\i686-pc-mingw32\immodules;c:\devel\target\b9c27d8bdadd13a9fcdbaa4f00664a2b\lib\gtk-2.0\2.10.0\immodules;c:\devel\target\b9c27d8bdadd13a9fcdbaa4f00664a2b\lib\gtk-2.0\i686-pc-mingw32\immodules;c:\devel\target\b9c27d8bdadd13a9fcdbaa4f00664a2b\lib\gtk-2.0\immodules
 #

data/vendor/local/include/gtk-2.0/gdk/gdk.h

@@ -77,8 +77,8 @@ void gdk_pre_parse_libgtk_only          (void);
 
 #ifndef GDK_DISABLE_DEPRECATED
 void  	  gdk_exit		   	(gint	    	 error_code);
-#endif /* GDK_DISABLE_DEPRECATED */
 gchar*	  gdk_set_locale	   	(void);
+#endif /* GDK_DISABLE_DEPRECATED */
 
 G_CONST_RETURN char *gdk_get_program_class (void);
 void                 gdk_set_program_class (const char *program_class);
@@ -96,15 +96,12 @@ gboolean  gdk_get_use_xshm		(void);
 gchar*	                  gdk_get_display		(void);
 G_CONST_RETURN gchar*	  gdk_get_display_arg_name	(void);
 
-#if !defined (GDK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
-/* Used by gtk_input_add_full () */
+#ifndef GDK_DISABLE_DEPRECATED
 gint gdk_input_add_full	  (gint		     source,
 			   GdkInputCondition condition,
 			   GdkInputFunction  function,
 			   gpointer	     data,
 			   GDestroyNotify    destroy);
-#endif /* !GDK_DISABLE_DEPRECATED || GTK_COMPILATION */
-#ifndef GDK_DISABLE_DEPRECATED
 gint gdk_input_add	  (gint		     source,
 			   GdkInputCondition condition,
 			   GdkInputFunction  function,

data/vendor/local/include/gtk-2.0/gdk/gdkcairo.h

@@ -44,6 +44,10 @@ void     gdk_cairo_set_source_pixmap (cairo_t            *cr,
                                       GdkPixmap          *pixmap,
                                       double              pixmap_x,
                                       double              pixmap_y);
+void     gdk_cairo_set_source_window (cairo_t            *cr,
+                                      GdkWindow          *window,
+                                      double              x,
+                                      double              y);
 
 void     gdk_cairo_rectangle         (cairo_t            *cr,
                                       const GdkRectangle *rectangle);

data/vendor/local/include/gtk-2.0/gdk/gdkdisplay.h

@@ -193,8 +193,10 @@ void             gdk_display_warp_pointer          (GdkDisplay             *disp
 						    gint                   x,
 						    gint                   y);
 
+#ifndef GDK_DISABLE_DEPRECATED
 GdkDisplayPointerHooks *gdk_display_set_pointer_hooks (GdkDisplay                   *display,
 						       const GdkDisplayPointerHooks *new_hooks);
+#endif
 
 GdkDisplay *gdk_display_open_default_libgtk_only (void);
 

data/vendor/local/include/gtk-2.0/gdk/gdkdnd.h

@@ -104,7 +104,9 @@ struct _GdkDragContextClass {
 /* Drag and Drop */
 
 GType            gdk_drag_context_get_type   (void) G_GNUC_CONST;
+#if !defined (GDK_DISABLE_DEPRECATED) || defined (GDK_COMPILATION)
 GdkDragContext * gdk_drag_context_new        (void);
+#endif
 
 GList           *gdk_drag_context_list_targets         (GdkDragContext *context);
 GdkDragAction    gdk_drag_context_get_actions          (GdkDragContext *context);
@@ -112,6 +114,9 @@ GdkDragAction    gdk_drag_context_get_suggested_action (GdkDragContext *context)
 GdkDragAction    gdk_drag_context_get_selected_action  (GdkDragContext *context);
 
 GdkWindow       *gdk_drag_context_get_source_window    (GdkDragContext *context);
+GdkWindow       *gdk_drag_context_get_dest_window      (GdkDragContext *context);
+GdkDragProtocol  gdk_drag_context_get_protocol         (GdkDragContext *context);
+
 
 #ifndef GDK_DISABLE_DEPRECATED
 void             gdk_drag_context_ref        (GdkDragContext *context);
@@ -149,6 +154,7 @@ void    gdk_drag_find_window_for_screen   (GdkDragContext   *context,
 					   GdkDragProtocol  *protocol);
 
 #ifndef GDK_MULTIHEAD_SAFE
+#ifndef GDK_DISABLE_DEPRECATED
 GdkNativeWindow gdk_drag_get_protocol (GdkNativeWindow   xid,
 				       GdkDragProtocol  *protocol);
 
@@ -158,6 +164,7 @@ void    gdk_drag_find_window  (GdkDragContext   *context,
 			       gint              y_root,
 			       GdkWindow       **dest_window,
 			       GdkDragProtocol  *protocol);
+#endif /* GDK_DISABLE_DEPRECATED */
 #endif /* GDK_MULTIHEAD_SAFE */
 
 gboolean        gdk_drag_motion      (GdkDragContext *context,

data/vendor/local/include/gtk-2.0/gdk/gdkdrawable.h

@@ -250,16 +250,19 @@ gpointer        gdk_drawable_get_data     (GdkDrawable    *drawable,
 					   const gchar    *key);
 #endif /* GDK_DISABLE_DEPRECATED */
 
-void            gdk_drawable_get_size     (GdkDrawable	  *drawable,
-					   gint	          *width,
-					   gint  	  *height);
 void	        gdk_drawable_set_colormap (GdkDrawable	  *drawable,
 					   GdkColormap	  *colormap);
 GdkColormap*    gdk_drawable_get_colormap (GdkDrawable	  *drawable);
-GdkVisual*      gdk_drawable_get_visual   (GdkDrawable	  *drawable);
 gint            gdk_drawable_get_depth    (GdkDrawable	  *drawable);
+
+#if !defined (GDK_DISABLE_DEPRECATED)
+void            gdk_drawable_get_size     (GdkDrawable	  *drawable,
+					   gint	          *width,
+					   gint  	  *height);
+GdkVisual*      gdk_drawable_get_visual   (GdkDrawable	  *drawable);
 GdkScreen*	gdk_drawable_get_screen   (GdkDrawable    *drawable);
 GdkDisplay*	gdk_drawable_get_display  (GdkDrawable    *drawable);
+#endif /* GDK_DISABLE_DEPRECATED */
 
 #ifndef GDK_DISABLE_DEPRECATED
 GdkDrawable*    gdk_drawable_ref          (GdkDrawable    *drawable);

data/vendor/local/include/gtk-2.0/gdk/gdkfont.h

@@ -24,7 +24,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#if !defined(GDK_DISABLE_DEPRECATED) || defined(GDK_COMPILATION) || defined(GTK_COMPILATION)
+#if !defined(GDK_DISABLE_DEPRECATED) || defined(GDK_COMPILATION)
 
 #ifndef __GDK_FONT_H__
 #define __GDK_FONT_H__

data/vendor/local/include/gtk-2.0/gdk/gdkinput.h

@@ -141,6 +141,7 @@ void                  gdk_device_get_key        (GdkDevice       *device,
                                                  GdkModifierType *modifiers);
 GdkAxisUse            gdk_device_get_axis_use   (GdkDevice       *device,
                                                  guint            index);
+gint                  gdk_device_get_n_keys     (GdkDevice       *device);
 gint                  gdk_device_get_n_axes     (GdkDevice       *device);
 
 /* Functions to configure a device */

data/vendor/local/include/gtk-2.0/gdk/gdkpixmap.h

@@ -103,6 +103,10 @@ GdkPixmap* gdk_pixmap_colormap_create_from_xpm_d (GdkDrawable    *drawable,
 						  gchar         **data);
 #endif
 
+void          gdk_pixmap_get_size                (GdkPixmap      *pixmap,
+                                                  gint	         *width,
+                                                  gint  	 *height);
+
 /* Functions to create/lookup pixmaps from their native equivalents
  */
 #ifndef GDK_MULTIHEAD_SAFE

data/vendor/local/include/gtk-2.0/gdk/gdkproperty.h

@@ -67,16 +67,12 @@ void     gdk_property_change (GdkWindow     *window,
 void     gdk_property_delete (GdkWindow     *window,
 			      GdkAtom        property);
 #ifndef GDK_MULTIHEAD_SAFE
+#ifndef GDK_DISABLE_DEPRECATED
 gint gdk_text_property_to_text_list (GdkAtom        encoding,
 				     gint           format,
 				     const guchar  *text,
 				     gint           length,
 				     gchar       ***list);
-gint gdk_text_property_to_utf8_list (GdkAtom        encoding,
-				     gint           format,
-				     const guchar  *text,
-				     gint           length,
-				     gchar       ***list);
 gboolean gdk_utf8_to_compound_text (const gchar *str,
 				    GdkAtom     *encoding,
 				    gint        *format,
@@ -87,22 +83,29 @@ gint gdk_string_to_compound_text    (const gchar   *str,
 				     gint          *format,
 				     guchar       **ctext,
 				     gint          *length);
+gint gdk_text_property_to_utf8_list (GdkAtom        encoding,
+				     gint           format,
+				     const guchar  *text,
+				     gint           length,
+				     gchar       ***list);
+#endif
 #endif
 
-gint gdk_text_property_to_text_list_for_display (GdkDisplay     *display,
+gint gdk_text_property_to_utf8_list_for_display (GdkDisplay     *display,
 						 GdkAtom         encoding,
 						 gint            format,
 						 const guchar   *text,
 						 gint            length,
 						 gchar        ***list);
-gint gdk_text_property_to_utf8_list_for_display (GdkDisplay     *display,
+
+gchar   *gdk_utf8_to_string_target   (const gchar *str);
+#ifndef GDK_DISABLE_DEPRECATED
+gint gdk_text_property_to_text_list_for_display (GdkDisplay     *display,
 						 GdkAtom         encoding,
 						 gint            format,
 						 const guchar   *text,
 						 gint            length,
 						 gchar        ***list);
-  
-gchar   *gdk_utf8_to_string_target   (const gchar *str);
 gint     gdk_string_to_compound_text_for_display (GdkDisplay   *display,
 						  const gchar  *str,
 						  GdkAtom      *encoding,
@@ -118,6 +121,7 @@ gboolean gdk_utf8_to_compound_text_for_display   (GdkDisplay   *display,
 
 void gdk_free_text_list             (gchar        **list);
 void gdk_free_compound_text         (guchar        *ctext);
+#endif
 
 G_END_DECLS
 

data/vendor/local/include/gtk-2.0/gdk/gdkspawn.h

@@ -30,6 +30,7 @@
 
 G_BEGIN_DECLS
 
+#ifndef GDK_DISABLE_DEPRECATED
 gboolean gdk_spawn_on_screen              (GdkScreen             *screen,
 					   const gchar           *working_directory,
 					   gchar                **argv,
@@ -56,6 +57,7 @@ gboolean gdk_spawn_on_screen_with_pipes   (GdkScreen             *screen,
 gboolean gdk_spawn_command_line_on_screen (GdkScreen             *screen,
 					   const gchar           *command_line,
 					   GError               **error);
+#endif
 
 G_END_DECLS
 

data/vendor/local/include/gtk-2.0/gdk/gdkwin32.h

@@ -117,6 +117,11 @@ GdkDrawable  *gdk_win32_begin_direct_draw_libgtk_only (GdkDrawable *drawable,
 						       gint *y_offset_out);
 void          gdk_win32_end_direct_draw_libgtk_only (gpointer priv_data);
 
+GdkWindow *   gdk_win32_window_foreign_new_for_display (GdkDisplay *display,
+                                                        GdkNativeWindow anid);
+GdkWindow *   gdk_win32_window_lookup_for_display (GdkDisplay *display,
+                                                   GdkNativeWindow anid);
+
 
 G_END_DECLS
 

data/vendor/local/include/gtk-2.0/gdk/gdkwindow.h

@@ -335,6 +335,13 @@ GdkWindow*    gdk_window_new                   (GdkWindow     *parent,
 void          gdk_window_destroy               (GdkWindow     *window);
 GdkWindowType gdk_window_get_window_type       (GdkWindow     *window);
 gboolean      gdk_window_is_destroyed          (GdkWindow     *window);
+
+GdkScreen*    gdk_window_get_screen            (GdkWindow     *window);
+GdkDisplay*   gdk_window_get_display           (GdkWindow     *window);
+GdkVisual*    gdk_window_get_visual            (GdkWindow     *window);
+int           gdk_window_get_width             (GdkWindow     *window);
+int           gdk_window_get_height            (GdkWindow     *window);
+
 GdkWindow*    gdk_window_at_pointer            (gint          *win_x,
                                                 gint          *win_y);
 void          gdk_window_show                  (GdkWindow     *window);
@@ -468,6 +475,7 @@ gboolean gdk_window_set_static_gravities (GdkWindow *window,
 					  gboolean   use_static);   
 
 /* Functions to create/lookup windows from their native equivalents */ 
+#if !defined(GDK_DISABLE_DEPRECATED) || defined(GDK_COMPILATION)
 #ifndef GDK_MULTIHEAD_SAFE
 GdkWindow*    gdk_window_foreign_new (GdkNativeWindow anid);
 GdkWindow*    gdk_window_lookup      (GdkNativeWindow anid);
@@ -476,6 +484,7 @@ GdkWindow    *gdk_window_foreign_new_for_display (GdkDisplay      *display,
 						  GdkNativeWindow  anid);
 GdkWindow*    gdk_window_lookup_for_display (GdkDisplay      *display,
 					     GdkNativeWindow  anid);
+#endif
 
 
 /* GdkWindow */
@@ -509,7 +518,9 @@ void gdk_window_set_urgency_hint      (GdkWindow *window,
 void          gdk_window_set_geometry_hints (GdkWindow          *window,
 					     const GdkGeometry  *geometry,
 					     GdkWindowHints      geom_mask);
+#if !defined(GDK_DISABLE_DEPRECATED) || defined(GDK_COMPILATION)
 void          gdk_set_sm_client_id          (const gchar        *sm_client_id);
+#endif
 
 void	      gdk_window_begin_paint_rect   (GdkWindow          *window,
 					     const GdkRectangle *rectangle);
@@ -566,7 +577,7 @@ void       gdk_window_coords_from_parent (GdkWindow       *window,
                                           gdouble         *x,
                                           gdouble         *y);
 
-#if !defined (GDK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION) || defined (GDK_COMPILATION)
+#if !defined (GDK_DISABLE_DEPRECATED) || defined (GDK_COMPILATION)
 /* Used by gtk_handle_box_button_changed () */
 gboolean      gdk_window_get_deskrelative_origin (GdkWindow	  *window,
 					  gint		  *x,
@@ -691,10 +702,6 @@ void gdk_window_get_internal_paint_info (GdkWindow    *window,
 void gdk_window_enable_synchronized_configure (GdkWindow *window);
 void gdk_window_configure_finished            (GdkWindow *window);
 
-#ifndef GDK_MULTIHEAD_SAFE
-GdkPointerHooks *gdk_set_pointer_hooks (const GdkPointerHooks *new_hooks);   
-#endif /* GDK_MULTIHEAD_SAFE */
-
 GdkWindow *gdk_get_default_root_window (void);
 
 /* Offscreen redirection */
@@ -715,12 +722,15 @@ void       gdk_window_redirect_to_drawable   (GdkWindow     *window,
 void       gdk_window_remove_redirection     (GdkWindow     *window);
 
 #ifndef GDK_DISABLE_DEPRECATED
+#ifndef GDK_MULTIHEAD_SAFE
+GdkPointerHooks *gdk_set_pointer_hooks (const GdkPointerHooks *new_hooks);   
+#endif /* GDK_MULTIHEAD_SAFE */
+
 #define GDK_ROOT_PARENT()             (gdk_get_default_root_window ())
 #define gdk_window_get_size            gdk_drawable_get_size
 #define gdk_window_get_type            gdk_window_get_window_type
 #define gdk_window_get_colormap        gdk_drawable_get_colormap
 #define gdk_window_set_colormap        gdk_drawable_set_colormap
-#define gdk_window_get_visual          gdk_drawable_get_visual
 #define gdk_window_ref                 g_object_ref
 #define gdk_window_unref               g_object_unref