auroraeosrose		Sun Jul 13 19:21:19 2008 UTC

  Added files:                 
    /php-gtk/ext/gtk+	gdk-2.8.overrides 

  Modified files:              
    /php-gtk/ext/gtk+	gdk-2.12.overrides gdk-2.8-types.defs 
                     	gdk-2.8.defs gdk-types.defs gdk.defs 
                     	gdk.overrides gtk.overrides 
  Log:
  more overrides and gdk fixes
  
http://cvs.php.net/viewvc.cgi/php-gtk/ext/gtk+/gdk-2.12.overrides?r1=1.3&r2=1.4&diff_format=u
Index: php-gtk/ext/gtk+/gdk-2.12.overrides
diff -u php-gtk/ext/gtk+/gdk-2.12.overrides:1.3 php-gtk/ext/gtk+/gdk-2.12.overrides:1.4
--- php-gtk/ext/gtk+/gdk-2.12.overrides:1.3	Sat Jul 12 23:55:09 2008
+++ php-gtk/ext/gtk+/gdk-2.12.overrides	Sun Jul 13 19:21:18 2008
@@ -1,5 +1,5 @@
 /* vim: set et ft=cpp fdm=marker: */
-%% include gdk.overrides
+%% include gdk-2.8.overrides
 
 %%
 ignore-glob
http://cvs.php.net/viewvc.cgi/php-gtk/ext/gtk+/gdk-2.8-types.defs?r1=1.1&r2=1.2&diff_format=u
Index: php-gtk/ext/gtk+/gdk-2.8-types.defs
diff -u php-gtk/ext/gtk+/gdk-2.8-types.defs:1.1 php-gtk/ext/gtk+/gdk-2.8-types.defs:1.2
--- php-gtk/ext/gtk+/gdk-2.8-types.defs:1.1	Sat Jul 12 23:55:10 2008
+++ php-gtk/ext/gtk+/gdk-2.8-types.defs	Sun Jul 13 19:21:19 2008
@@ -9,4 +9,10 @@
   (parent "GdkPixbufAnimation")
   (c-name "GdkPixbufSimpleAnim")
   (gtype-id "GDK_TYPE_PIXBUF_SIMPLE_ANIM")
+)
+(define-object PixbufSimpleAnimIter
+  (in-module "Gdk")
+  (parent "GdkPixbufAnimationIter")
+  (c-name "GdkPixbufSimpleAnimIter")
+  (gtype-id "GDK_TYPE_PIXBUF_SIMPLE_ANIM_ITER")
 )
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-gtk/ext/gtk+/gdk-2.8.defs?r1=1.1&r2=1.2&diff_format=u
Index: php-gtk/ext/gtk+/gdk-2.8.defs
diff -u php-gtk/ext/gtk+/gdk-2.8.defs:1.1 php-gtk/ext/gtk+/gdk-2.8.defs:1.2
--- php-gtk/ext/gtk+/gdk-2.8.defs:1.1	Sat Jul 12 23:55:10 2008
+++ php-gtk/ext/gtk+/gdk-2.8.defs	Sun Jul 13 19:21:19 2008
@@ -1,68 +1,6 @@
 (include "gdk-2.8-types.defs")
 (include "gdk.defs")
 
-;; From /home/jdahlin/dev/gtk-2.8/gtk+/gdk/gdkpango.h
-
-(define-function gdk_pango_renderer_get_type
-  (c-name "gdk_pango_renderer_get_type")
-  (return-type "GType")
-)
-
-(define-function pango_renderer_new
-  (c-name "gdk_pango_renderer_new")
-  (is-constructor-of "GdkPangoRenderer")
-  (return-type "PangoRenderer*")
-  (parameters
-    '("GdkScreen*" "screen")
-  )
-)
-
-(define-function pango_renderer_get_default
-  (c-name "gdk_pango_renderer_get_default")
-  (return-type "PangoRenderer*")
-  (parameters
-    '("GdkScreen*" "screen")
-  )
-)
-
-(define-method set_drawable
-  (of-object "GdkPangoRenderer")
-  (c-name "gdk_pango_renderer_set_drawable")
-  (return-type "none")
-  (parameters
-    '("GdkDrawable*" "drawable" (null-ok))
-  )
-)
-
-(define-method set_gc
-  (of-object "GdkPangoRenderer")
-  (c-name "gdk_pango_renderer_set_gc")
-  (return-type "none")
-  (parameters
-    '("GdkGC*" "gc"(null-ok))
-  )
-)
-
-(define-method set_stipple
-  (of-object "GdkPangoRenderer")
-  (c-name "gdk_pango_renderer_set_stipple")
-  (return-type "none")
-  (parameters
-    '("PangoRenderPart" "part")
-    '("GdkBitmap*" "stipple"(null-ok))
-  )
-)
-
-(define-method set_override_color
-  (of-object "GdkPangoRenderer")
-  (c-name "gdk_pango_renderer_set_override_color")
-  (return-type "none")
-  (parameters
-    '("PangoRenderPart" "part")
-    '("const-GdkColor*" "color"(null-ok))
-  )
-)
-
 (define-function pango_context_get_for_screen
   (c-name "gdk_pango_context_get_for_screen")
   (return-type "PangoContext*")
@@ -213,7 +151,9 @@
 )
 
 (define-function cursor_new_from_name
+  (is-constructor-of "GdkCursor")
   (c-name "gdk_cursor_new_from_name")
+  (caller-owns-return #t)
   (return-type "GdkCursor*")
   (parameters
     '("GdkDisplay*" "display")
http://cvs.php.net/viewvc.cgi/php-gtk/ext/gtk+/gdk-types.defs?r1=1.8&r2=1.9&diff_format=u
Index: php-gtk/ext/gtk+/gdk-types.defs
diff -u php-gtk/ext/gtk+/gdk-types.defs:1.8 php-gtk/ext/gtk+/gdk-types.defs:1.9
--- php-gtk/ext/gtk+/gdk-types.defs:1.8	Sat Jul 12 23:55:10 2008
+++ php-gtk/ext/gtk+/gdk-types.defs	Sun Jul 13 19:21:19 2008
@@ -221,6 +221,12 @@
   )
 )
 
+(define-boxed Region
+  (in-module "Gdk")
+  (c-name "GdkRegion")
+  (gtype-id "GDK_TYPE_REGION")
+)
+
 ;; Enumerations and flags ...
 
 (define-enum Colorspace
http://cvs.php.net/viewvc.cgi/php-gtk/ext/gtk+/gdk.defs?r1=1.27&r2=1.28&diff_format=u
Index: php-gtk/ext/gtk+/gdk.defs
diff -u php-gtk/ext/gtk+/gdk.defs:1.27 php-gtk/ext/gtk+/gdk.defs:1.28
--- php-gtk/ext/gtk+/gdk.defs:1.27	Sat Jul 12 23:55:10 2008
+++ php-gtk/ext/gtk+/gdk.defs	Sun Jul 13 19:21:19 2008
@@ -4131,7 +4131,7 @@
   (return-type "none")
   (parameters
     '("GdkRegion*" "region")
-    '("gboolean" "(*child_func")
+    '("gboolean" "*callbackfunc")
   )
 )
 
@@ -4760,20 +4760,11 @@
   )
 )
 
-
-
-
-
-
-
-
-
-
-
-
 (define-function pixbuf_new_from_file_at_scale
+  (is-constructor-of "GdkPixbuf")
   (c-name "gdk_pixbuf_new_from_file_at_scale")
   (return-type "GdkPixbuf*")
+  (caller-owns-return #t)
   (parameters
     '("const-char*" "filename")
     '("int" "width")
@@ -4910,22 +4901,6 @@
   (return-type "gchar*")
 )
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 ;; From /opt/gnome/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h
 
 (define-function gdk_pixbuf_loader_get_type
@@ -4934,9 +4909,9 @@
 )
 
 (define-function gdk_pixbuf_loader_new
+  (is-constructor-of "GdkPixbufLoader")
   (c-name "gdk_pixbuf_loader_new")
   (return-type "GdkPixbufLoader*")
-  (deprecated "use GdkPixbufLoader() constructor instead")
 )
 
 (define-function gdk_pixbuf_loader_new_with_type
@@ -4951,6 +4926,8 @@
 )
 
 (define-function pixbuf_loader_new_with_mime_type
+  (is-constructor-of "GdkPixbufLoader")
+  (caller-owns-return #t)
   (c-name "gdk_pixbuf_loader_new_with_mime_type")
   (return-type "GdkPixbufLoader*")
   (parameters
@@ -5217,3 +5194,67 @@
     '("gpointer" "data")
   )
 )
+
+;; From /home/jdahlin/dev/gtk-2.8/gtk+/gdk/gdkpango.h
+
+(define-function gdk_pango_renderer_get_type
+  (c-name "gdk_pango_renderer_get_type")
+  (return-type "GType")
+)
+
+(define-function pango_renderer_new
+  (c-name "gdk_pango_renderer_new")
+  (is-constructor-of "GdkPangoRenderer")
+  (return-type "PangoRenderer*")
+  (parameters
+    '("GdkScreen*" "screen")
+  )
+)
+
+(define-method get_default
+  (c-name "gdk_pango_renderer_get_default")
+  (of-object "GdkPangoRenderer")
+  (return-type "PangoRenderer*")
+  (static #t)
+  (parameters
+    '("GdkScreen*" "screen")
+  )
+)
+
+(define-method set_drawable
+  (of-object "GdkPangoRenderer")
+  (c-name "gdk_pango_renderer_set_drawable")
+  (return-type "none")
+  (parameters
+    '("GdkDrawable*" "drawable" (null-ok))
+  )
+)
+
+(define-method set_gc
+  (of-object "GdkPangoRenderer")
+  (c-name "gdk_pango_renderer_set_gc")
+  (return-type "none")
+  (parameters
+    '("GdkGC*" "gc"(null-ok))
+  )
+)
+
+(define-method set_stipple
+  (of-object "GdkPangoRenderer")
+  (c-name "gdk_pango_renderer_set_stipple")
+  (return-type "none")
+  (parameters
+    '("PangoRenderPart" "part")
+    '("GdkBitmap*" "stipple"(null-ok))
+  )
+)
+
+(define-method set_override_color
+  (of-object "GdkPangoRenderer")
+  (c-name "gdk_pango_renderer_set_override_color")
+  (return-type "none")
+  (parameters
+    '("PangoRenderPart" "part")
+    '("const-GdkColor*" "color"(null-ok))
+  )
+)
http://cvs.php.net/viewvc.cgi/php-gtk/ext/gtk+/gdk.overrides?r1=1.81&r2=1.82&diff_format=u
Index: php-gtk/ext/gtk+/gdk.overrides
diff -u php-gtk/ext/gtk+/gdk.overrides:1.81 php-gtk/ext/gtk+/gdk.overrides:1.82
--- php-gtk/ext/gtk+/gdk.overrides:1.81	Wed Jan 23 02:31:43 2008
+++ php-gtk/ext/gtk+/gdk.overrides	Sun Jul 13 19:21:19 2008
@@ -18,6 +18,24 @@
 
 #define MAX_INTENSITY 65535
 
+#ifndef GDK_TYPE_REGION
+GType phpg_region_get_type (void) {
+	static GType our_type = 0;
+
+	if (our_type == 0)
+      	our_type = g_boxed_type_register_static ("GdkRegion",
+      		(GBoxedCopyFunc)gdk_region_copy,
+			(GBoxedFreeFunc)gdk_region_destroy);
+	return our_type;
+}
+#define GDK_TYPE_REGION (phpg_region_get_type())
+#endif
+
+#ifndef GDK_TYPE_PIXBUF_SIMPLE_ANIM_ITER
+GType gtk_print_capabilites_get_type (void) G_GNUC_CONST;
+#define GDK_TYPE_PIXBUF_SIMPLE_ANIM_ITER (gdk_pixbuf_simple_anim_iter_get_type())
+#endif
+
 /* Forward declaration, since gen_gtk.h is generated later. */
 extern PHP_GTK_EXPORT_CE(gtkwidget_ce);
 
@@ -34,6 +52,7 @@
 %%
 ignore-glob
     *_get_type
+    *ref
 
 %%
 ignore
@@ -56,6 +75,7 @@
     gdk_pixmap_colormap_create_from_xpm_d
     gdk_string_extents
     gdk_window_peek_children
+    gdk_window_invalidate_maybe_recurse
 
 /* }}} */
 
http://cvs.php.net/viewvc.cgi/php-gtk/ext/gtk+/gtk.overrides?r1=1.259&r2=1.260&diff_format=u
Index: php-gtk/ext/gtk+/gtk.overrides
diff -u php-gtk/ext/gtk+/gtk.overrides:1.259 php-gtk/ext/gtk+/gtk.overrides:1.260
--- php-gtk/ext/gtk+/gtk.overrides:1.259	Sat Jul 12 23:53:46 2008
+++ php-gtk/ext/gtk+/gtk.overrides	Sun Jul 13 19:21:19 2008
@@ -20,6 +20,11 @@
 #undef GDK_DISPLAY
 #define GDK_DISPLAY(object) (GDK_DISPLAY_OBJECT(object))
 
+#ifndef GDK_TYPE_REGION
+extern phpg_region_get_type();
+#define GDK_TYPE_REGION (phpg_region_get_type())
+#endif
+
 %% {{{ ignores [confirmed]
 
 %%

http://cvs.php.net/viewvc.cgi/php-gtk/ext/gtk+/gdk-2.8.overrides?view=markup&rev=1.1
Index: php-gtk/ext/gtk+/gdk-2.8.overrides
+++ php-gtk/ext/gtk+/gdk-2.8.overrides
/* vim: set et ft=cpp fdm=marker: */
%% include gdk.overrides