gtk2 1.0.3-x86-mingw32 → 1.1.0-x86-mingw32

data/ext/gtk2/rbgtkwindowgroup.c

@@ -1,45 +1,56 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkwindowgroup.c -
-
-  $Author: mutoh $
-  $Date: 2003/01/19 14:28:25 $
-
-  Copyright (C) 2002,2003 Masao Mutoh
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002,2003 Masao Mutoh
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
 
 #include "global.h"
 
+#define RG_TARGET_NAMESPACE cWindowGroup
+
 static VALUE
-rbgwingrp_initialize(VALUE self)
+rg_initialize(VALUE self)
 {
-	G_INITIALIZE(self, gtk_window_group_new());
-	return Qnil;
+    G_INITIALIZE(self, gtk_window_group_new());
+    return Qnil;
 }
 
 static VALUE
-rbgwingrp_add_window(VALUE self, VALUE window)
+rg_add(VALUE self, VALUE window)
 {
-	gtk_window_group_add_window(GTK_WINDOW_GROUP(RVAL2GOBJ(self)), 
+    gtk_window_group_add_window(GTK_WINDOW_GROUP(RVAL2GOBJ(self)), 
                                     GTK_WINDOW(RVAL2GOBJ(window)));
-	return self;
+    return self;
 }
 
 static VALUE
-rbgwingrp_remove_window(VALUE self, VALUE window)
+rg_remove(VALUE self, VALUE window)
 {
-	gtk_window_group_remove_window(GTK_WINDOW_GROUP(RVAL2GOBJ(self)), 
+    gtk_window_group_remove_window(GTK_WINDOW_GROUP(RVAL2GOBJ(self)), 
                                        GTK_WINDOW(RVAL2GOBJ(window)));
-	return self;
+    return self;
 }
-  
 
 void 
-Init_gtk_windowgroup()
+Init_gtk_windowgroup(VALUE mGtk)
 {
-    VALUE gWindowGroup = G_DEF_CLASS(GTK_TYPE_WINDOW_GROUP, "WindowGroup", mGtk);
-    rb_define_method(gWindowGroup, "initialize", rbgwingrp_initialize, 0);
-    rb_define_method(gWindowGroup, "add", rbgwingrp_add_window, 1);
-    rb_define_method(gWindowGroup, "remove", rbgwingrp_remove_window, 1);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_WINDOW_GROUP, "WindowGroup", mGtk);
+    RG_DEF_METHOD(initialize, 0);
+    RG_DEF_METHOD(add, 1);
+    RG_DEF_METHOD(remove, 1);
 }

data/sample/testgtk/labels.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 =begin header
 
   labels.rb - a part of testgtk.c rewritten in Ruby/GTK2

data/sample/testgtk/testgtk.rb

@@ -32,6 +32,8 @@ Original Copyright:
 
 =end
 
+$:.unshift(File.dirname(__FILE__))
+
 require 'gtk2'
 require 'sample'
 require 'button'

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:\MinGW\msys\1.0\home\dieterv\.gtk-2.0\2.10.0\i686-pc-mingw32\immodules;C:\MinGW\msys\1.0\home\dieterv\.gtk-2.0\2.10.0\immodules;C:\MinGW\msys\1.0\home\dieterv\.gtk-2.0\i686-pc-mingw32\immodules;C:\MinGW\msys\1.0\home\dieterv\.gtk-2.0\immodules;C:\MinGW\msys\1.0\devel\target\0684580203da616c0bb222943906b663\lib\gtk-2.0\2.10.0\i686-pc-mingw32\immodules;C:\MinGW\msys\1.0\devel\target\0684580203da616c0bb222943906b663\lib\gtk-2.0\2.10.0\immodules;C:\MinGW\msys\1.0\devel\target\0684580203da616c0bb222943906b663\lib\gtk-2.0\i686-pc-mingw32\immodules;C:\MinGW\msys\1.0\devel\target\0684580203da616c0bb222943906b663\lib\gtk-2.0\immodules
 #

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

@@ -77,10 +77,10 @@ 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);
+const char *         gdk_get_program_class (void);
 void                 gdk_set_program_class (const char *program_class);
 
 /* Push and pop error handlers for X errors
@@ -94,17 +94,14 @@ gboolean  gdk_get_use_xshm		(void);
 #endif /* GDK_DISABLE_DEPRECATED */
 
 gchar*	                  gdk_get_display		(void);
-G_CONST_RETURN gchar*	  gdk_get_display_arg_name	(void);
+const 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

@@ -109,7 +109,7 @@ struct _GdkDisplayClass
 {
   GObjectClass parent_class;
   
-  G_CONST_RETURN gchar *     (*get_display_name)   (GdkDisplay *display);
+  const gchar *              (*get_display_name)   (GdkDisplay *display);
   gint			     (*get_n_screens)      (GdkDisplay *display);
   GdkScreen *		     (*get_screen)         (GdkDisplay *display,
 						    gint        screen_num);
@@ -141,7 +141,7 @@ struct _GdkDisplayPointerHooks
 GType       gdk_display_get_type (void) G_GNUC_CONST;
 GdkDisplay *gdk_display_open                (const gchar *display_name);
 
-G_CONST_RETURN gchar * gdk_display_get_name (GdkDisplay *display);
+const gchar * gdk_display_get_name         (GdkDisplay *display);
 
 gint        gdk_display_get_n_screens      (GdkDisplay  *display);
 GdkScreen * gdk_display_get_screen         (GdkDisplay  *display,
@@ -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

@@ -130,7 +130,7 @@ GType          gdk_device_get_type      (void) G_GNUC_CONST;
 GList *        gdk_devices_list              (void);
 #endif /* GDK_MULTIHEAD_SAFE */
 
-G_CONST_RETURN gchar *gdk_device_get_name       (GdkDevice *device);
+const gchar *         gdk_device_get_name       (GdkDevice *device);
 GdkInputSource        gdk_device_get_source     (GdkDevice *device);
 GdkInputMode          gdk_device_get_mode       (GdkDevice *device);
 gboolean              gdk_device_get_has_cursor (GdkDevice *device);
@@ -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

@@ -77,6 +77,7 @@ G_BEGIN_DECLS
 
 /* Return true if the GdkWindow is a win32 implemented window */
 gboolean      gdk_win32_window_is_win32 (GdkWindow *window);
+HWND          gdk_win32_window_get_impl_hwnd (GdkWindow *window);
 
 /* Return the Gdk* for a particular HANDLE */
 gpointer      gdk_win32_handle_table_lookup (GdkNativeWindow handle);
@@ -117,6 +118,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