com gtk/php-gtk: Final fixes to make the extensions non-interfering.: ext/sourceview/modifyGenerated.php ext/sourceview/sourceview.defs

Commit:    3e9cc798dd2efef61e5fbee2b7c090e1a3da41a6
Author:    Anant Narayanan <[email protected]>         Sun, 19 Mar 2006 04:27:29 +0000
Parents:   382fca79214fba616cb38fcbe0d7b8695cb607d6
Branches:  master

Link:       http://git.php.net/?p=gtk/php-gtk.git;a=commitdiff;h=3e9cc798dd2efef61e5fbee2b7c090e1a3da41a6

Log:
Final fixes to make the extensions non-interfering.

Changed paths:
  M  ext/sourceview/modifyGenerated.php
  M  ext/sourceview/sourceview.defs


Diff:
3e9cc798dd2efef61e5fbee2b7c090e1a3da41a6
diff --git a/ext/sourceview/modifyGenerated.php b/ext/sourceview/modifyGenerated.php
index 147bf6a..4544bd7 100644
--- a/ext/sourceview/modifyGenerated.php
+++ b/ext/sourceview/modifyGenerated.php
@@ -9,6 +9,11 @@ for($i=0; $i<5; $i++) {
 }
 
 fwrite($tmpFile, "\nPHP_GTK_EXPORT_CE(gtkcontainer_ce);\n");
+fwrite($tmpFile, "PHP_GTK_EXPORT_CE(gdkpixbuf_ce);\n");
+fwrite($tmpFile, "PHP_GTK_EXPORT_CE(gtktextbuffer_ce);\n");
+fwrite($tmpFile, "PHP_GTK_EXPORT_CE(gtktexttagtable_ce);\n");
+fwrite($tmpFile, "PHP_GTK_EXPORT_CE(gtktextview_ce);\n");
+fwrite($tmpFile, "PHP_GTK_EXPORT_CE(gtktextmark_ce);\n");
 
 for($i=5; $i<=count($contents); $i++) {
     fwrite($tmpFile, $contents[$i]);
diff --git a/ext/sourceview/sourceview.defs b/ext/sourceview/sourceview.defs
index 584d7a3..315158b 100644
--- a/ext/sourceview/sourceview.defs
+++ b/ext/sourceview/sourceview.defs
@@ -1218,50 +1218,3 @@
   (c-name "gtk_source_tag_style_mask_get_type")
   (return-type "GType")
 )
-
-;; Added  from gtk-types.defs to resolve undeclared errors.
-;; Shouldn't be here, but this is a temporary solution.
-
-(define-object Pixbuf
-  (in-module "Gdk")
-  (parent "GObject")
-  (c-name "GdkPixbuf")
-  (gtype-id "GDK_TYPE_PIXBUF")
-;  (fields
-;  //this next one isn't a real field.  added for Python bindings
-;  //commented because sourceview complains
-;  //and also because these shouldn't be here ;)
-;   '("guchar*" "pixel_array")
-;  )
-)
-
-(define-object TextBuffer
-  (in-module "Gtk")
-  (parent "GObject")
-  (c-name "GtkTextBuffer")
-  (gtype-id "GTK_TYPE_TEXT_BUFFER")
-  (fields
-    '("GtkTextTagTable*" "tag_table")
-  )
-)
-
-(define-object TextTagTable
-  (in-module "Gtk")
-  (parent "GObject")
-  (c-name "GtkTextTagTable")
-  (gtype-id "GTK_TYPE_TEXT_TAG_TABLE")
-)
-
-(define-object TextView
-  (in-module "Gtk")
-  (parent "GtkContainer")
-  (c-name "GtkTextView")
-  (gtype-id "GTK_TYPE_TEXT_VIEW")
-)
-
-(define-object TextMark
-  (in-module "Gtk")
-  (parent "GObject")
-  (c-name "GtkTextMark")
-  (gtype-id "GTK_TYPE_TEXT_MARK")
-)