gtk2 1.0.0-x86-mingw32 → 1.0.1-x86-mingw32

data/ext/gtk2/rbgtkwindow.c

@@ -21,7 +21,7 @@ gwin_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE arg;
     GtkWindowType tp = GTK_WINDOW_TOPLEVEL;
-    gchar* title = NULL;
+    const gchar *title = NULL;
     GtkWidget* window = NULL;
 
     if (rb_scan_args(argc, argv, "01", &arg) == 1) {
@@ -34,7 +34,7 @@ gwin_initialize(int argc, VALUE *argv, VALUE self)
     }
     window = gtk_window_new(tp);
 
-    if (title)
+    if (title != NULL)
         gtk_window_set_title(GTK_WINDOW(window), title);
 
     RBGTK_INITIALIZE(self, window);
@@ -114,32 +114,15 @@ gwin_set_geometry_hints(VALUE self, VALUE geometry_widget, VALUE geometry, VALUE
     return self;
 }
 
-static VALUE
-gwin_set_gravity(VALUE self, VALUE gravity)
-{
-    gtk_window_set_gravity(_SELF(self), RVAL2GENUM(gravity, GDK_TYPE_GRAVITY));
-    return self;
-}
-
-static VALUE
-gwin_get_gravity(VALUE self)
-{
-    return GENUM2RVAL(gtk_window_get_gravity(_SELF(self)), GDK_TYPE_GRAVITY);
-}
-
-static VALUE
-gwin_set_transient_for(VALUE self, VALUE parent)
-{
-    gtk_window_set_transient_for(_SELF(self), _SELF(parent));
-    return self;
-}
-
-static VALUE
-gwin_set_destroy_with_parent(VALUE self, VALUE setting)
-{
-    gtk_window_set_destroy_with_parent(_SELF(self), RVAL2CBOOL(setting));
-    return self;
-}
+/* Defined as Properties:
+void                gtk_window_set_gravity              (GtkWindow *window,
+                                                         GdkGravity gravity);
+GdkGravity          gtk_window_get_gravity              (GtkWindow *window);
+void                gtk_window_set_transient_for        (GtkWindow *window,
+                                                         GtkWindow *parent);
+void                gtk_window_set_destroy_with_parent  (GtkWindow *window,
+                                                         gboolean setting);
+*/
 
 /* Define as Properties.
 void        gtk_window_set_screen           (GtkWindow *window,
@@ -313,12 +296,10 @@ gwin_begin_move_drag(VALUE self, VALUE button, VALUE root_x, VALUE root_y, VALUE
     return self;
 }
 
-static VALUE
-gwin_set_decorated(VALUE self, VALUE setting)
-{
-    gtk_window_set_decorated(_SELF(self), RVAL2CBOOL(setting));
-    return self;
-}
+/* Defined as Properties:
+void                gtk_window_set_decorated            (GtkWindow *window,
+                                                         gboolean setting);
+*/
 
 static VALUE
 gwin_set_frame_dimensions(VALUE self, VALUE left, VALUE top, VALUE right, VALUE bottom)
@@ -344,20 +325,11 @@ gwin_set_mnemonic_modifier(VALUE self, VALUE modifier)
     return self;
 }
 
-static VALUE
-gwin_set_role(VALUE self, VALUE role)
-{
-    gtk_window_set_role(_SELF(self), RVAL2CSTR(role));
-    return self;
-}
-
-static VALUE
-gwin_set_type_hint(VALUE self, VALUE hint)
-{
-    gtk_window_set_type_hint(_SELF(self), RVAL2GENUM(hint, GDK_TYPE_WINDOW_TYPE_HINT));
-    return self;
-}
 /* Defined as Properties
+void                gtk_window_set_decorated            (GtkWindow *window,
+                                                         gboolean setting);
+void                gtk_window_set_type_hint            (GtkWindow *window,
+                                                         GdkWindowTypeHint hint);
 void        gtk_window_set_skip_taskbar_hint
                                             (GtkWindow *window,
                                              gboolean setting);
@@ -381,15 +353,10 @@ gboolean    gtk_window_get_deletable        (GtkWindow *window);
 
 void        gtk_window_set_deletable        (GtkWindow *window,
                                              gboolean setting);
+gboolean            gtk_window_get_decorated            (GtkWindow *window);
 */
 
 
-static VALUE
-gwin_get_decorated(VALUE self)
-{
-    return CBOOL2RVAL(gtk_window_get_decorated(_SELF(self)));
-}
-
 static VALUE
 gwin_s_get_default_icon_list(VALUE self)
 {
@@ -404,11 +371,9 @@ gwin_get_default_size(VALUE self)
     return rb_ary_new3(2, INT2NUM(width), INT2NUM(height));
 }
 
-static VALUE
-gwin_get_destroy_with_parent(VALUE self)
-{
-    return gtk_window_get_destroy_with_parent(_SELF(self)) ? Qtrue :  Qfalse;
-}
+/* Defined as Properties:
+gboolean            gtk_window_get_destroy_with_parent  (GtkWindow *window);
+*/
 
 static VALUE
 gwin_get_frame_dimensions(VALUE self)
@@ -448,12 +413,11 @@ gwin_get_position(VALUE self)
     return rb_ary_new3(2, INT2NUM(root_x), INT2NUM(root_y));
 }
 
-static VALUE
-gwin_get_role(VALUE self)
-{
-    const gchar* role = gtk_window_get_role(_SELF(self));
-    return role ? CSTR2RVAL(role) : Qnil;
-}
+/* Defined as Properties:
+const gchar *       gtk_window_get_role                 (GtkWindow *window);
+GtkWindow *         gtk_window_get_transient_for        (GtkWindow *window);
+GdkWindowTypeHint   gtk_window_get_type_hint            (GtkWindow *window);
+*/
 
 static VALUE
 gwin_get_size(VALUE self)
@@ -463,19 +427,6 @@ gwin_get_size(VALUE self)
     return rb_ary_new3(2, INT2NUM(width), INT2NUM(height));
 }
 
-static VALUE
-gwin_get_transient_for(VALUE self)
-{
-    GtkWindow* window = gtk_window_get_transient_for(_SELF(self));
-    return window ? GOBJ2RVAL(window) : Qnil;
-}
-
-static VALUE
-gwin_get_type_hint(VALUE self)
-{
-    return GENUM2RVAL(gtk_window_get_type_hint(_SELF(self)), GDK_TYPE_WINDOW_TYPE_HINT);
-}
-
 #if GTK_CHECK_VERSION(2,10,0)
 static VALUE
 gwin_get_group(VALUE self)
@@ -588,6 +539,7 @@ gwin_set_icon_list(VALUE self, VALUE list)
     g_list_free(glist);
     return list;
 }
+
 #if GTK_CHECK_VERSION(2,2,0)
 static VALUE
 gwin_s_set_auto_startup_notification(VALUE self, VALUE setting)
@@ -650,14 +602,10 @@ Init_gtk_window()
     /* active_(focus|default) are deprecated. Use activate_* instead. */
     rb_define_method(gWindow, "active_focus", gwin_active_focus, 0);
     rb_define_method(gWindow, "active_default", gwin_active_default, 0);
-    rb_define_method(gWindow, "activate_focus", gwin_activate_focus, 0);
-    rb_define_method(gWindow, "activate_default", gwin_activate_default, 0);
+    G_REPLACE_ACTION(gWindow, "activate_focus", gwin_activate_focus, 0);
+    G_REPLACE_ACTION(gWindow, "activate_default", gwin_activate_default, 0);
     rb_define_method(gWindow, "set_default_size", gwin_set_default_size, 2);
     rb_define_method(gWindow, "set_geometry_hints", gwin_set_geometry_hints, 3);
-    rb_define_method(gWindow, "set_gravity", gwin_set_gravity, 1);
-    rb_define_method(gWindow, "gravity", gwin_get_gravity, 0);
-    rb_define_method(gWindow, "set_transient_for", gwin_set_transient_for, 1);
-    rb_define_method(gWindow, "set_destroy_with_parent", gwin_set_destroy_with_parent, 1);
     rb_define_singleton_method(gWindow, "toplevels", gwin_s_list_toplevels, 0);
     rb_define_method(gWindow, "add_mnemonic", gwin_add_mnemonic, 2);
     rb_define_method(gWindow, "remove_mnemonic", gwin_remove_mnemonic, 2);
@@ -686,25 +634,17 @@ Init_gtk_window()
 #endif
     rb_define_method(gWindow, "begin_resize_drag", gwin_begin_resize_drag, 5);
     rb_define_method(gWindow, "begin_move_drag", gwin_begin_move_drag, 4);
-    rb_define_method(gWindow, "set_decorated", gwin_set_decorated, 1);
     rb_define_method(gWindow, "set_frame_dimensions", gwin_set_frame_dimensions, 4);
     rb_define_method(gWindow, "set_mnemonic_modifier", gwin_set_mnemonic_modifier, 1);
-    rb_define_method(gWindow, "set_role", gwin_set_role, 1);
-    rb_define_method(gWindow, "set_type_hint", gwin_set_type_hint, 1);
-    rb_define_method(gWindow, "decorated?", gwin_get_decorated, 0);
     rb_define_method(gWindow, "default_size", gwin_get_default_size, 0);
     rb_define_singleton_method(gWindow, "default_icon_list", gwin_s_get_default_icon_list, 0);
-    rb_define_method(gWindow, "destroy_with_parent?", gwin_get_destroy_with_parent, 0);
     rb_define_method(gWindow, "frame_dimensions", gwin_get_frame_dimensions, 0);
     rb_define_method(gWindow, "set_has_frame", gwin_set_has_frame, 1);
     rb_define_method(gWindow, "has_frame?", gwin_get_has_frame, 0);
     rb_define_method(gWindow, "icon_list", gwin_get_icon_list, 0);
     rb_define_method(gWindow, "mnemonic_modifier", gwin_get_mnemonic_modifier, 0);
     rb_define_method(gWindow, "position", gwin_get_position, 0);
-    rb_define_method(gWindow, "role", gwin_get_role, 0);
     rb_define_method(gWindow, "size", gwin_get_size, 0);
-    rb_define_method(gWindow, "transient_for", gwin_get_transient_for, 0);
-    rb_define_method(gWindow, "type_hint", gwin_get_type_hint, 0);
 #if GTK_CHECK_VERSION(2,10,0)
     rb_define_method(gWindow, "group", gwin_get_group, 0);
 #endif
@@ -719,7 +659,7 @@ Init_gtk_window()
 #if GTK_CHECK_VERSION(2,6,0)
     rb_define_singleton_method(gWindow, "set_default_icon_name", gwin_s_set_default_icon_name, 1);
 #endif
-    rb_define_method(gWindow, "set_icon", gwin_set_icon, 1);
+    G_REPLACE_SET_PROPERTY(gWindow, "icon", gwin_set_icon, 1);
     rb_define_method(gWindow, "set_icon_list", gwin_set_icon_list, 1);
 #if GTK_CHECK_VERSION(2,2,0)
     rb_define_singleton_method(gWindow, "set_auto_startup_notification", 

data/lib/gtk2/base.rb

@@ -19,7 +19,7 @@ vendor_dir = base_dir + "vendor" + "local"
 vendor_bin_dir = vendor_dir + "bin"
 GLib.prepend_environment_path(vendor_bin_dir)
 begin
-  major, minor, micro, = RUBY_VERSION.split(/\./)
+  major, minor, _ = RUBY_VERSION.split(/\./)
   require "#{major}.#{minor}/gtk2.so"
 rescue LoadError
   require "gtk2.so"

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

@@ -146,9 +146,8 @@ def copy_properties(node, props, prop_dict):
 
 class GtkBuilderConverter(object):
 
-    def __init__(self, skip_windows, target_version, root):
+    def __init__(self, skip_windows, root):
         self.skip_windows = skip_windows
-        self.target_version = target_version
         self.root = root
         self.root_objects = []
         self.objects = {}
@@ -296,25 +295,6 @@ 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):
@@ -752,10 +732,7 @@ def usage():
 def main(args):
     try:
         opts, args = getopt.getopt(args[1:], "hwr:",
-                                   ["help",
-                                    "skip-windows",
-                                    "target-version=",
-                                    "root="])
+                                   ["help", "skip-windows", "root="])
     except getopt.GetoptError:
         usage()
         return 2
@@ -769,7 +746,6 @@ 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()
@@ -778,11 +754,8 @@ 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\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
+# 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
 #

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);
-gchar*	  gdk_set_locale	   	(void);
 #endif /* GDK_DISABLE_DEPRECATED */
+gchar*	  gdk_set_locale	   	(void);
 
 G_CONST_RETURN char *gdk_get_program_class (void);
 void                 gdk_set_program_class (const char *program_class);
@@ -96,12 +96,15 @@ gboolean  gdk_get_use_xshm		(void);
 gchar*	                  gdk_get_display		(void);
 G_CONST_RETURN gchar*	  gdk_get_display_arg_name	(void);
 
-#ifndef GDK_DISABLE_DEPRECATED
+#if !defined (GDK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
+/* Used by gtk_input_add_full () */
 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,10 +44,6 @@ 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,10 +193,8 @@ 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,9 +104,7 @@ 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);
@@ -114,9 +112,6 @@ 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);
@@ -154,7 +149,6 @@ 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);
 
@@ -164,7 +158,6 @@ 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,19 +250,16 @@ gpointer        gdk_drawable_get_data     (GdkDrawable    *drawable,
 					   const gchar    *key);
 #endif /* GDK_DISABLE_DEPRECATED */
 
-void	        gdk_drawable_set_colormap (GdkDrawable	  *drawable,
-					   GdkColormap	  *colormap);
-GdkColormap*    gdk_drawable_get_colormap (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);
+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);
 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)
+#if !defined(GDK_DISABLE_DEPRECATED) || defined(GDK_COMPILATION) || defined(GTK_COMPILATION)
 
 #ifndef __GDK_FONT_H__
 #define __GDK_FONT_H__

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

@@ -141,7 +141,6 @@ 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 */