[prev in list] [next in list] [prev in thread] [next in thread] 

List:       php-gtk-cvs
Subject:    [php-gtk-cvs] cvs: php-gtk /ext/extra .cvsignore config.w32 gtkextra-addons.defs gtkextra.overrides
From:       "Elizabeth Marie Smith" <auroraeosrose () php ! net>
Date:       2007-03-01 15:48:07
Message-ID: cvsauroraeosrose1172764087 () cvsserver
[Download RAW message or body]

auroraeosrose		Thu Mar  1 15:48:07 2007 UTC

  Added files:                 
    /php-gtk/ext/extra	config.w32 

  Modified files:              
    /php-gtk/ext/extra	.cvsignore gtkextra-addons.defs 
                      	gtkextra.overrides php_gtkextra.c 
    /php-gtk/ext/sourceview	php_sourceview.c 
  Log:
  Support for gtkextra on windows
  
http://cvs.php.net/viewvc.cgi/php-gtk/ext/extra/.cvsignore?r1=1.3&r2=1.4&diff_format=u
                
Index: php-gtk/ext/extra/.cvsignore
diff -u /dev/null php-gtk/ext/extra/.cvsignore:1.4
--- /dev/null	Thu Mar  1 15:48:07 2007
+++ php-gtk/ext/extra/.cvsignore	Thu Mar  1 15:48:06 2007
@@ -0,0 +1,11 @@
+.deps
+Makefile
+*.lo
+*.la
+.libs
+libs.mk
+gen_*
+*.cache
+*.plg
+Debug_TS
+Release_TS
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-gtk/ext/extra/gtkextra-addons.defs?r1=1.1&r2=1.2&diff_format=u
                
Index: php-gtk/ext/extra/gtkextra-addons.defs
diff -u php-gtk/ext/extra/gtkextra-addons.defs:1.1 \
                php-gtk/ext/extra/gtkextra-addons.defs:1.2
--- php-gtk/ext/extra/gtkextra-addons.defs:1.1	Fri Feb  9 15:37:31 2007
+++ php-gtk/ext/extra/gtkextra-addons.defs	Thu Mar  1 15:48:06 2007
@@ -1,9 +1,5 @@
 ;; Not from any header file
 
-(define-function _set_data_from_pyobject_callback
-  (c-name "_set_data_from_pyobject_callback")
-)
-
 (define-function gtk_sheet_range_new
   (is-constructor-of "GtkSheetRange")
   (c-name "gtk_sheet_range_new")
http://cvs.php.net/viewvc.cgi/php-gtk/ext/extra/gtkextra.overrides?r1=1.2&r2=1.3&diff_format=u
                
Index: php-gtk/ext/extra/gtkextra.overrides
diff -u php-gtk/ext/extra/gtkextra.overrides:1.2 \
                php-gtk/ext/extra/gtkextra.overrides:1.3
--- php-gtk/ext/extra/gtkextra.overrides:1.2	Fri Feb  9 15:46:18 2007
+++ php-gtk/ext/extra/gtkextra.overrides	Thu Mar  1 15:48:06 2007
@@ -3,6 +3,7 @@
 headers
 #include <gtkextra/gtkextra.h>
 #include <gtkextra/gtkextratypebuiltins.h>
+#include <gtkextra/gtkplotcandle.h>
 #include "ext/gtk+/php_gtk+.h"
 #include "php_gtk_api.h"
 
@@ -14,7 +15,6 @@
 #define GTK_TYPE_FONT_COMBO (gtk_font_combo_get_type())
 #define GTK_TYPE_PLOT3_D (gtk_plot3d_get_type())
 #define GTK_TYPE_TOGGLE_COMBO (gtk_toggle_combo_get_type())
-#define GTK_TYPE_PLOT_CANDLE (gtk_plot_candle_get_type())
 
 #define GTK_TYPE_PSFONT (gtk_psfont_get_type ())
 static GType
http://cvs.php.net/viewvc.cgi/php-gtk/ext/extra/php_gtkextra.c?r1=1.1&r2=1.2&diff_format=u
                
Index: php-gtk/ext/extra/php_gtkextra.c
diff -u php-gtk/ext/extra/php_gtkextra.c:1.1 php-gtk/ext/extra/php_gtkextra.c:1.2
--- php-gtk/ext/extra/php_gtkextra.c:1.1	Fri Feb  9 15:37:31 2007
+++ php-gtk/ext/extra/php_gtkextra.c	Thu Mar  1 15:48:06 2007
@@ -18,13 +18,13 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
  
-/* $Id: php_gtkextra.c,v 1.1 2007/02/09 15:37:31 anant Exp $ */
+/* $Id: php_gtkextra.c,v 1.2 2007/03/01 15:48:06 auroraeosrose Exp $ */
 
 #include "php_gtkextra.h"
 
 #if HAVE_GTKEXTRA
 
-#ifdef COMPILE_DL_GTKEXTRA
+#ifdef COMPILE_DL_GTKEXTRA2
 PHP_GTK_GET_EXTENSION(extra)
 #endif
 
@@ -36,7 +36,7 @@
 	return SUCCESS;
 }
 
-php_gtk_ext_entry gtkextra_ext_entry = {
+php_gtk_ext_entry extra_ext_entry = {
 	"extra",
 	PHP_GTK_XINIT(extra),
 	NULL,
http://cvs.php.net/viewvc.cgi/php-gtk/ext/sourceview/php_sourceview.c?r1=1.2&r2=1.3&diff_format=u
                
Index: php-gtk/ext/sourceview/php_sourceview.c
diff -u php-gtk/ext/sourceview/php_sourceview.c:1.2 \
                php-gtk/ext/sourceview/php_sourceview.c:1.3
--- php-gtk/ext/sourceview/php_sourceview.c:1.2	Mon Mar  6 21:51:55 2006
+++ php-gtk/ext/sourceview/php_sourceview.c	Thu Mar  1 15:48:06 2007
@@ -18,13 +18,13 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
  
-/* $Id: php_sourceview.c,v 1.2 2006/03/06 21:51:55 anant Exp $ */
+/* $Id: php_sourceview.c,v 1.3 2007/03/01 15:48:06 auroraeosrose Exp $ */
 
 #include "php_sourceview.h"
 
 #if HAVE_SOURCEVIEW
 
-#ifdef COMPILE_DL_SOURCEVIEW
+#ifdef COMPILE_DL_SOURCEVIEW2
 PHP_GTK_GET_EXTENSION(sourceview)
 #endif
 

http://cvs.php.net/viewvc.cgi/php-gtk/ext/extra/config.w32?view=markup&rev=1.1
Index: php-gtk/ext/extra/config.w32
+++ php-gtk/ext/extra/config.w32

ARG_WITH("extra", "gtkextra support", "no");

if (PHP_GTK_EXTRA != "no" || PHP_GTK_ALL != "no") {
	if (CHECK_HEADER("gtkextra\\gtkextra.h") && CHECK_LIB("gtkextra-2.0.lib", "extra"))
	{
		if (FSO.FileExists("win32\\temp.bat")) {

			var temp = FSO.OpenTextFile("win32\\temp.bat", 8);
			temp.WriteLine("php -q generator\\generator.php -l win32\\logs\\config_extra.log \
-o ext\\extra\\gtkextra.overrides -p gtkextra -r ext\\gtk+\\gtk.defs \
                ext\\extra\\gtkextra.defs > ext\\extra\\gen_gtkextra.c");
                  temp.WriteLine('grep -h "^PHP_GTK_EXPORT_CE" \
ext\\extra\\gen_gtkextra.c | sed -e "s/^/PHP_GTK_API extern /" > \
ext\\extra\\gen_gtkextra.h');		  temp.Close();
		}

		ADD_FLAG("CFLAGS_EXTRA", "/I ext\\extra /I ..\\ext\\extra /D HAVE_GTKEXTRA=1");
		EXTENSION("extra", "php_gtkextra.c gen_gtkextra.c", true); // always shared
		AC_DEFINE("HAVE_GTKEXTRA", 1, "gtkextra enabled");

	} else {

		WARNING("gtkextra not enabled; libraries and headers not found");
	}
}

-- 
PHP-GTK CVS Mailing List (http://gtk.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php


[prev in list] [next in list] [prev in thread] [next in thread]