cvs: php-gtk /ext/gtk+ Makefile.in gdk.overrides gtk.overrides php_gtk+_types.c /ext/libglade libglade.overrides /generator generator.php templates.php /main php_gtk.c php_gtk.h
[email protected] ("Andrei Zmievski") Sat, 11 Aug 2001 03:28:20 -0000
| Newsgroups | php.gtk |
|---|---|
| Message-ID | <cvsandrei997500500@cvsserver> |
andrei Fri Aug 10 23:28:20 2001 EDT
Modified files:
/php-gtk/ext/gtk+ Makefile.in gdk.overrides gtk.overrides
php_gtk+_types.c
/php-gtk/ext/libglade libglade.overrides
/php-gtk/generator generator.php templates.php
/php-gtk/main php_gtk.c php_gtk.h
Log:
- Implemented a workaround for registering classes with proper name
capitalization.
- Removed the unnecessary wrap_ prefix from internal function names.
andrei-20010810232820.txt
(text/plain, 38.1 KB)
Index: php-gtk/ext/gtk+/Makefile.in
diff -u php-gtk/ext/gtk+/Makefile.in:1.5 php-gtk/ext/gtk+/Makefile.in:1.6
--- php-gtk/ext/gtk+/Makefile.in:1.5 Thu Aug 2 00:52:39 2001
+++ php-gtk/ext/gtk+/Makefile.in Fri Aug 10 23:28:19 2001
@@ -9,10 +9,10 @@
php_gtk+.o php_gtk+.lo php_gtk+.slo: gen_gtk.h
gen_gtk.c: gtk.defs gtk-extrafuncs.defs gtk.overrides
- php -q $(top_srcdir)/generator/generator.php -o ext/gtk%2b/gtk.overrides -p gtk ext/gtk%2b/gtk.defs > gen_gtk.c
+ php -q $(top_srcdir)/generator/generator.php -o ext/gtk%2b/gtk.overrides -p Gtk ext/gtk%2b/gtk.defs > gen_gtk.c
gen_gdk.c: gdk.defs gdk.overrides
- php -q $(top_srcdir)/generator/generator.php -o ext/gtk%2b/gdk.overrides -p gdk ext/gtk%2b/gdk.defs > gen_gdk.c
+ php -q $(top_srcdir)/generator/generator.php -o ext/gtk%2b/gdk.overrides -p Gdk ext/gtk%2b/gdk.defs > gen_gdk.c
gen_gtk.h: gen_gtk.c gen_gdk.c
grep -h "^PHP_GTK_EXPORT_CE" gen_gtk.c gen_gdk.c | sed -e "s!^!extern !" > gen_gtk.h
Index: php-gtk/ext/gtk+/gdk.overrides
diff -u php-gtk/ext/gtk+/gdk.overrides:1.4 php-gtk/ext/gtk+/gdk.overrides:1.5
--- php-gtk/ext/gtk+/gdk.overrides:1.4 Mon Jul 30 20:37:00 2001
+++ php-gtk/ext/gtk+/gdk.overrides Fri Aug 10 23:28:19 2001
@@ -8,7 +8,7 @@
gdk_pixmap_new
%%
override gdk_color_parse
-PHP_FUNCTION(wrap_gdk_color_parse)
+PHP_FUNCTION(gdk_color_parse)
{
gchar *color_spec;
GdkColor color;
@@ -24,7 +24,7 @@
}
%%
override gdk_pixmap_create_from_xpm
-PHP_FUNCTION(wrap_gdk_pixmap_create_from_xpm)
+PHP_FUNCTION(gdk_pixmap_create_from_xpm)
{
zval *php_window, *php_trans_color;
gchar *filename;
@@ -54,7 +54,7 @@
}
%%
override gdk_pixmap_create_from_xpm_d
-PHP_FUNCTION(wrap_gdk_pixmap_create_from_xpm_d)
+PHP_FUNCTION(gdk_pixmap_create_from_xpm_d)
{
zval *php_window, *php_trans_color, *php_data;
zval **line;
@@ -96,7 +96,7 @@
}
%%
override gdk_pixmap_colormap_create_from_xpm
-PHP_FUNCTION(wrap_gdk_pixmap_colormap_create_from_xpm)
+PHP_FUNCTION(gdk_pixmap_colormap_create_from_xpm)
{
zval *php_window, *php_trans_color, *php_colormap;
gchar *filename;
@@ -130,7 +130,7 @@
}
%%
override gdk_pixmap_colormap_create_from_xpm_d
-PHP_FUNCTION(wrap_gdk_pixmap_colormap_create_from_xpm_d)
+PHP_FUNCTION(gdk_pixmap_colormap_create_from_xpm_d)
{
zval *php_window, *php_colormap,
*php_trans_color, *php_data;
Index: php-gtk/ext/gtk+/gtk.overrides
diff -u php-gtk/ext/gtk+/gtk.overrides:1.9 php-gtk/ext/gtk+/gtk.overrides:1.10
--- php-gtk/ext/gtk+/gtk.overrides:1.9 Fri Aug 10 12:15:56 2001
+++ php-gtk/ext/gtk+/gtk.overrides Fri Aug 10 23:28:19 2001
@@ -166,19 +166,19 @@
gtk_draw_handle
%%
override gtk_true
-PHP_FUNCTION(wrap_gtk_true)
+PHP_FUNCTION(gtk_true)
{
RETURN_TRUE;
}
%%
override gtk_false
-PHP_FUNCTION(wrap_gtk_false)
+PHP_FUNCTION(gtk_false)
{
RETURN_FALSE;
}
%%
override gtk_timeout_add
-PHP_FUNCTION(wrap_gtk_timeout_add)
+PHP_FUNCTION(gtk_timeout_add)
{
guint32 interval;
zval *callback = NULL;
@@ -206,7 +206,7 @@
}
%%
override gtk_idle_add
-PHP_FUNCTION(wrap_gtk_idle_add)
+PHP_FUNCTION(gtk_idle_add)
{
zval *callback = NULL;
zval *extra;
@@ -233,7 +233,7 @@
}
%%
override gtk_quit_add
-PHP_FUNCTION(wrap_gtk_quit_add)
+PHP_FUNCTION(gtk_quit_add)
{
gint main_level;
zval *callback = NULL;
@@ -261,7 +261,7 @@
}
%%
override gtk_input_add_full
-PHP_FUNCTION(wrap_gtk_input_add_full)
+PHP_FUNCTION(gtk_input_add_full)
{
zval *source_rsrc;
int rsrc_type;
@@ -297,7 +297,7 @@
}
%%
override gtk_signal_connect
-static void wrap_gtk_signal_connect_impl(INTERNAL_FUNCTION_PARAMETERS, int pass_object, int after)
+static void gtk_signal_connect_impl(INTERNAL_FUNCTION_PARAMETERS, int pass_object, int after)
{
char *name = NULL;
zval *callback = NULL;
@@ -326,31 +326,31 @@
data, php_gtk_destroy_notify, FALSE, after));
}
-PHP_FUNCTION(wrap_gtk_signal_connect)
+PHP_FUNCTION(gtk_signal_connect)
{
- wrap_gtk_signal_connect_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1, 0);
+ gtk_signal_connect_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1, 0);
}
%%
override gtk_signal_connect_object
-PHP_FUNCTION(wrap_gtk_signal_connect_object)
+PHP_FUNCTION(gtk_signal_connect_object)
{
- wrap_gtk_signal_connect_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0, 0);
+ gtk_signal_connect_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0, 0);
}
%%
override gtk_signal_connect_after
-PHP_FUNCTION(wrap_gtk_signal_connect_after)
+PHP_FUNCTION(gtk_signal_connect_after)
{
- wrap_gtk_signal_connect_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1, 1);
+ gtk_signal_connect_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1, 1);
}
%%
override gtk_signal_connect_object_after
-PHP_FUNCTION(wrap_gtk_signal_connect_object_after)
+PHP_FUNCTION(gtk_signal_connect_object_after)
{
- wrap_gtk_signal_connect_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0, 1);
+ gtk_signal_connect_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0, 1);
}
%%
override gtk_signal_emit
-PHP_FUNCTION(wrap_gtk_signal_emit)
+PHP_FUNCTION(gtk_signal_emit)
{
char *name;
guint signal_id, nparams, i;
@@ -414,7 +414,7 @@
}
%%
override gtk_object_set
-PHP_FUNCTION(wrap_gtk_object_set)
+PHP_FUNCTION(gtk_object_set)
{
zval *hash;
GtkArg *arg;
@@ -436,7 +436,7 @@
}
%%
override gtk_object_get
-PHP_FUNCTION(wrap_gtk_object_get)
+PHP_FUNCTION(gtk_object_get)
{
char *name;
GtkArg garg;
@@ -469,7 +469,7 @@
}
%%
override gtk_object_set_data
-PHP_FUNCTION(wrap_gtk_object_set_data)
+PHP_FUNCTION(gtk_object_set_data)
{
char *key;
zval *data;
@@ -484,7 +484,7 @@
}
%%
override gtk_object_get_data
-PHP_FUNCTION(wrap_gtk_object_get_data)
+PHP_FUNCTION(gtk_object_get_data)
{
char *key;
zval *data;
@@ -502,7 +502,7 @@
}
%%
override gtk_widget_intersect
-PHP_FUNCTION(wrap_gtk_widget_intersect)
+PHP_FUNCTION(gtk_widget_intersect)
{
GdkRectangle area, intersection;
@@ -530,7 +530,7 @@
// remove_menu->menu = NULL;
}
-PHP_FUNCTION(wrap_gtk_menu_attach_to_widget)
+PHP_FUNCTION(gtk_menu_attach_to_widget)
{
zval *php_widget = NULL;
GtkWidget* obj = NULL;
@@ -544,7 +544,7 @@
}
%%
override gtk_curve_get_vector
-PHP_FUNCTION(wrap_gtk_curve_get_vector)
+PHP_FUNCTION(gtk_curve_get_vector)
{
int veclen = -1, i;
gfloat *vector = NULL;
@@ -565,7 +565,7 @@
}
%%
override gtk_curve_set_vector
-PHP_FUNCTION(wrap_gtk_curve_set_vector)
+PHP_FUNCTION(gtk_curve_set_vector)
{
int veclen, i;
gfloat *vector = NULL;
@@ -592,7 +592,7 @@
}
%%
overrides gtk_rc_get_default_files
-PHP_FUNCTION(wrap_gtk_rc_get_default_files)
+PHP_FUNCTION(gtk_rc_get_default_files)
{
gchar **ret;
@@ -614,7 +614,7 @@
ignore gtk_clist_new_with_titles
%%
override gtk_clist_new
-PHP_FUNCTION(wrap_gtk_clist_new)
+PHP_FUNCTION(gtk_clist_new)
{
GtkObject *wrapped_obj;
gint columns, i;
@@ -664,7 +664,7 @@
}
%%
override gtk_clist_append
-PHP_FUNCTION(wrap_gtk_clist_append)
+PHP_FUNCTION(gtk_clist_append)
{
gint columns, i, res;
gchar **list;
@@ -698,7 +698,7 @@
}
%%
override gtk_clist_prepend
-PHP_FUNCTION(wrap_gtk_clist_prepend)
+PHP_FUNCTION(gtk_clist_prepend)
{
gint columns, i, res;
gchar **list;
@@ -732,7 +732,7 @@
}
%%
override gtk_clist_insert
-PHP_FUNCTION(wrap_gtk_clist_insert)
+PHP_FUNCTION(gtk_clist_insert)
{
gint columns, i, row, res;
gchar **list;
@@ -766,7 +766,7 @@
}
%%
override gtk_clist_get_text
-PHP_FUNCTION(wrap_gtk_clist_get_text)
+PHP_FUNCTION(gtk_clist_get_text)
{
gint row, column;
gchar *text;
@@ -785,7 +785,7 @@
ignore gtk_menu_item_new_with_label
%%
override gtk_menu_item_new
-PHP_FUNCTION(wrap_gtk_menu_item_new)
+PHP_FUNCTION(gtk_menu_item_new)
{
char *label = NULL;
GtkObject *wrapped_obj;
@@ -816,7 +816,7 @@
ignore gtk_check_menu_item_new_with_label
%%
override gtk_check_menu_item_new
-PHP_FUNCTION(wrap_gtk_check_menu_item_new)
+PHP_FUNCTION(gtk_check_menu_item_new)
{
char *label;
GtkObject *wrapped_obj;
@@ -844,7 +844,7 @@
}
%%
override gtk_list_append_items
-PHP_FUNCTION(wrap_gtk_list_append_items)
+PHP_FUNCTION(gtk_list_append_items)
{
zval *php_items, **item;
GList *items = NULL;
@@ -871,7 +871,7 @@
}
%%
override gtk_list_prepend_items
-PHP_FUNCTION(wrap_gtk_list_prepend_items)
+PHP_FUNCTION(gtk_list_prepend_items)
{
zval *php_items, **item;
GList *items = NULL;
@@ -898,7 +898,7 @@
}
%%
override gtk_list_insert_items
-PHP_FUNCTION(wrap_gtk_list_insert_items)
+PHP_FUNCTION(gtk_list_insert_items)
{
zval *php_items, **item;
GList *items = NULL;
@@ -927,7 +927,7 @@
ignore gtk_list_item_new_with_label
%%
override gtk_list_item_new
-PHP_FUNCTION(wrap_gtk_list_item_new)
+PHP_FUNCTION(gtk_list_item_new)
{
GtkObject *wrapped_obj;
gchar *text = NULL;
@@ -957,7 +957,7 @@
ignore gtk_tree_item_new_with_label
%%
override gtk_tree_item_new
-PHP_FUNCTION(wrap_gtk_tree_item_new)
+PHP_FUNCTION(gtk_tree_item_new)
{
GtkObject *wrapped_obj;
gchar *text = NULL;
@@ -987,7 +987,7 @@
ignore gtk_button_new_with_label
%%
override gtk_button_new
-PHP_FUNCTION(wrap_gtk_button_new)
+PHP_FUNCTION(gtk_button_new)
{
GtkObject *wrapped_obj;
gchar *text = NULL;
@@ -1017,7 +1017,7 @@
ignore gtk_toggle_button_new_with_label
%%
override gtk_toggle_button_new
-PHP_FUNCTION(wrap_gtk_toggle_button_new)
+PHP_FUNCTION(gtk_toggle_button_new)
{
GtkObject *wrapped_obj;
gchar *text = NULL;
@@ -1047,7 +1047,7 @@
ignore gtk_check_button_new_with_label
%%
override gtk_check_button_new
-PHP_FUNCTION(wrap_gtk_check_button_new)
+PHP_FUNCTION(gtk_check_button_new)
{
char *label;
GtkObject *wrapped_obj;
@@ -1080,7 +1080,7 @@
gtk_ctree_new
%%
override gtk_ctree_new_with_titles
-PHP_FUNCTION(wrap_gtk_ctree_new_with_titles)
+PHP_FUNCTION(gtk_ctree_new_with_titles)
{
GtkObject *wrapped_obj;
gint columns, tree_column, i;
@@ -1130,7 +1130,7 @@
}
%%
override gtk_ctree_insert_node
-PHP_FUNCTION(wrap_gtk_ctree_insert_node)
+PHP_FUNCTION(gtk_ctree_insert_node)
{
zval *php_parent, *php_sibling, *php_text,
*php_pixmap_closed, *php_pixmap_opened,
@@ -1284,31 +1284,31 @@
}
}
-PHP_FUNCTION(wrap_gtk_ctree_post_recursive)
+PHP_FUNCTION(gtk_ctree_post_recursive)
{
traverse_ctree(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0, 0);
}
%%
override gtk_ctree_post_recursive_to_depth
-PHP_FUNCTION(wrap_gtk_ctree_post_recursive_to_depth)
+PHP_FUNCTION(gtk_ctree_post_recursive_to_depth)
{
traverse_ctree(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1, 0);
}
%%
override gtk_ctree_pre_recursive
-PHP_FUNCTION(wrap_gtk_ctree_pre_recursive)
+PHP_FUNCTION(gtk_ctree_pre_recursive)
{
traverse_ctree(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0, 1);
}
%%
override gtk_ctree_pre_recursive_to_depth
-PHP_FUNCTION(wrap_gtk_ctree_pre_recursive_to_depth)
+PHP_FUNCTION(gtk_ctree_pre_recursive_to_depth)
{
traverse_ctree(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1, 1);
}
%%
override gtk_ctree_get_node_info
-PHP_FUNCTION(wrap_gtk_ctree_get_node_info)
+PHP_FUNCTION(gtk_ctree_get_node_info)
{
zval *node;
zval *php_pixmap_closed, *php_mask_closed;
@@ -1344,7 +1344,7 @@
}
%%
override gtk_container_children
-PHP_FUNCTION(wrap_gtk_container_children)
+PHP_FUNCTION(gtk_container_children)
{
GList *children, *tmp;
@@ -1395,7 +1395,7 @@
zval_ptr_dtor(¶ms);
}
-PHP_FUNCTION(wrap_gtk_item_factory_create_items)
+PHP_FUNCTION(gtk_item_factory_create_items)
{
zval *list, **item, *callback_data,
*callback, *extra = NULL;
@@ -1444,7 +1444,7 @@
}
%%
override gtk_combo_set_popdown_strings
-PHP_FUNCTION(wrap_gtk_combo_set_popdown_strings)
+PHP_FUNCTION(gtk_combo_set_popdown_strings)
{
zval *php_list, **item;
GList *list = NULL;
@@ -1467,7 +1467,7 @@
}
%%
override gtk_label_get
-PHP_FUNCTION(wrap_gtk_label_get)
+PHP_FUNCTION(gtk_label_get)
{
gchar *text;
@@ -1530,7 +1530,7 @@
}
%%
override gtk_calendar_get_date
-PHP_FUNCTION(wrap_gtk_calendar_get_date)
+PHP_FUNCTION(gtk_calendar_get_date)
{
guint year, month, day;
@@ -1648,7 +1648,7 @@
ignore gtk_radio_menu_item_new_with_label
%%
override gtk_radio_menu_item_new
-PHP_FUNCTION(wrap_gtk_radio_menu_item_new)
+PHP_FUNCTION(gtk_radio_menu_item_new)
{
zval *php_group = NULL;
gchar *text = NULL;
@@ -1688,7 +1688,7 @@
ignore-glob gtk_radio_button_new_*
%%
override gtk_radio_button_new
-PHP_FUNCTION(wrap_gtk_radio_button_new)
+PHP_FUNCTION(gtk_radio_button_new)
{
zval *php_group = NULL;
gchar *text = NULL;
@@ -1726,7 +1726,7 @@
}
%%
override gtk_color_selection_set_color
-PHP_FUNCTION(wrap_gtk_color_selection_set_color)
+PHP_FUNCTION(gtk_color_selection_set_color)
{
gdouble value[4];
@@ -1741,7 +1741,7 @@
}
%%
override gtk_color_selection_get_color
-PHP_FUNCTION(wrap_gtk_color_selection_get_color)
+PHP_FUNCTION(gtk_color_selection_get_color)
{
gdouble value[4];
GtkColorSelection *colorsel;
@@ -1819,7 +1819,7 @@
ignore gtk_ctree_node_set_row_data_full
%%
override gtk_ctree_node_set_row_data
-PHP_FUNCTION(wrap_gtk_ctree_node_set_row_data)
+PHP_FUNCTION(gtk_ctree_node_set_row_data)
{
zval *node, *data;
@@ -1835,7 +1835,7 @@
}
%%
override gtk_ctree_node_get_row_data
-PHP_FUNCTION(wrap_gtk_ctree_node_get_row_data)
+PHP_FUNCTION(gtk_ctree_node_get_row_data)
{
zval *node, *data;
@@ -1855,7 +1855,7 @@
}
%%
override gtk_ctree_node_get_text
-PHP_FUNCTION(wrap_gtk_ctree_node_get_text)
+PHP_FUNCTION(gtk_ctree_node_get_text)
{
zval *node;
gint column;
@@ -1876,7 +1876,7 @@
}
%%
override gtk_ctree_node_get_pixmap
-PHP_FUNCTION(wrap_gtk_ctree_node_get_pixmap)
+PHP_FUNCTION(gtk_ctree_node_get_pixmap)
{
zval *node, *php_pixmap, *php_mask;
int column;
@@ -1902,7 +1902,7 @@
}
%%
override gtk_ctree_node_get_pixtext
-PHP_FUNCTION(wrap_gtk_ctree_node_get_pixtext)
+PHP_FUNCTION(gtk_ctree_node_get_pixtext)
{
zval *node, *php_pixmap = NULL, *php_mask = NULL;
int column;
@@ -1977,7 +1977,7 @@
zval_ptr_dtor(¶ms);
}
-PHP_FUNCTION(wrap_gtk_menu_popup)
+PHP_FUNCTION(gtk_menu_popup)
{
zval *php_pms, *php_pmi;
GtkWidget *pms = NULL, *pmi = NULL;
@@ -2010,7 +2010,7 @@
}
%%
override gtk_editable_insert_text
-PHP_FUNCTION(wrap_gtk_editable_insert_text)
+PHP_FUNCTION(gtk_editable_insert_text)
{
char *text;
int len, pos;
@@ -2025,7 +2025,7 @@
}
%%
override gtk_drag_dest_set
-PHP_FUNCTION(wrap_gtk_drag_dest_set)
+PHP_FUNCTION(gtk_drag_dest_set)
{
zval *php_flags, *php_targets, *php_actions;
zval **item;
@@ -2065,7 +2065,7 @@
}
%%
override gtk_drag_source_set
-PHP_FUNCTION(wrap_gtk_drag_source_set)
+PHP_FUNCTION(gtk_drag_source_set)
{
zval *php_sbmask, *php_targets, *php_actions;
zval **item;
@@ -2105,7 +2105,7 @@
}
%%
override gtk_drag_begin
-PHP_FUNCTION(wrap_gtk_drag_begin)
+PHP_FUNCTION(gtk_drag_begin)
{
zval *php_targets, *php_actions, *event;
zval *php_ret, **item;
Index: php-gtk/ext/gtk+/php_gtk+_types.c
diff -u php-gtk/ext/gtk+/php_gtk+_types.c:1.11 php-gtk/ext/gtk+/php_gtk+_types.c:1.12
--- php-gtk/ext/gtk+/php_gtk+_types.c:1.11 Mon Aug 6 13:08:32 2001
+++ php-gtk/ext/gtk+/php_gtk+_types.c Fri Aug 10 23:28:19 2001
@@ -18,7 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/* $Id: php_gtk+_types.c,v 1.11 2001/08/06 17:08:32 fmk Exp $ */
+/* $Id: php_gtk+_types.c,v 1.12 2001/08/11 03:28:19 andrei Exp $ */
#include "php_gtk.h"
@@ -62,7 +62,8 @@
/* GdkEvent */
static function_entry php_gdk_event_functions[] = {
- {"gdkevent", PHP_FN(wrap_no_direct_constructor), NULL},
+ {"GdkEvent", PHP_FN(no_direct_constructor), NULL},
+ {"gdkevent", PHP_FN(no_direct_constructor), NULL},
{NULL, NULL, NULL}
};
@@ -564,7 +565,8 @@
}
static function_entry php_gdk_window_functions[] = {
- {"gdkwindow", PHP_FN(wrap_no_direct_constructor), NULL},
+ {"GdkWindow", PHP_FN(no_direct_constructor), NULL},
+ {"gdkwindow", PHP_FN(no_direct_constructor), NULL},
{"raise", PHP_FN(gdk_window_raise), NULL},
{"lower", PHP_FN(gdk_window_lower), NULL},
{"get_pointer", PHP_FN(gdk_window_get_pointer), NULL},
@@ -603,6 +605,7 @@
}
static function_entry php_gdk_pixmap_functions[] = {
+ {"GdkPixmap", PHP_FN(gdkpixmap), NULL},
{"gdkpixmap", PHP_FN(gdkpixmap), NULL},
{"new_gc", PHP_FN(gdk_window_new_gc), NULL},
{"property_get", PHP_FN(gdk_window_property_get), NULL},
@@ -806,6 +809,7 @@
}
static function_entry php_gdk_color_functions[] = {
+ {"GdkColor", PHP_FN(gdkcolor), NULL},
{"gdkcolor", PHP_FN(gdkcolor), NULL},
{NULL, NULL, NULL}
};
@@ -921,7 +925,8 @@
}
static function_entry php_gdk_colormap_functions[] = {
- {"gdkcolormap", PHP_FN(wrap_no_direct_constructor), NULL},
+ {"GdkColormap", PHP_FN(no_direct_constructor), NULL},
+ {"gdkcolormap", PHP_FN(no_direct_constructor), NULL},
{"size", PHP_FN(gdk_colormap_size), NULL},
{"alloc", PHP_FN(gdk_colormap_alloc), NULL},
{NULL, NULL, NULL}
@@ -1005,7 +1010,8 @@
/* GdkAtom */
/* TODO maybe change this to have a real constructor */
static function_entry php_gdk_atom_functions[] = {
- {"gdkatom", PHP_FN(wrap_no_direct_constructor), NULL},
+ {"GdkAtom", PHP_FN(no_direct_constructor), NULL},
+ {"gdkatom", PHP_FN(no_direct_constructor), NULL},
{NULL, NULL, NULL}
};
@@ -1029,7 +1035,8 @@
/* GdkCursor */
static function_entry php_gdk_cursor_functions[] = {
- {"gdkcursor", PHP_FN(wrap_no_direct_constructor), NULL},
+ {"GdkCursor", PHP_FN(no_direct_constructor), NULL},
+ {"gdkcursor", PHP_FN(no_direct_constructor), NULL},
{NULL, NULL, NULL}
};
@@ -1095,7 +1102,8 @@
/* GdkVisual */
static function_entry php_gdk_visual_functions[] = {
- {"gdkvisual", PHP_FN(wrap_no_direct_constructor), NULL},
+ {"GdkVisual", PHP_FN(no_direct_constructor), NULL},
+ {"gdkvisual", PHP_FN(no_direct_constructor), NULL},
{NULL, NULL, NULL}
};
@@ -1232,7 +1240,8 @@
}
static function_entry php_gdk_font_functions[] = {
- {"gdkfont", PHP_FN(wrap_no_direct_constructor), NULL},
+ {"GdkFont", PHP_FN(no_direct_constructor), NULL},
+ {"gdkfont", PHP_FN(no_direct_constructor), NULL},
{"width", PHP_FN(gdk_font_width), NULL},
{"height", PHP_FN(gdk_font_height), NULL},
{"measure", PHP_FN(gdk_font_measure), NULL},
@@ -1336,7 +1345,8 @@
}
static function_entry php_gdk_gc_functions[] = {
- {"gdkgc", PHP_FN(wrap_no_direct_constructor), NULL},
+ {"GdkGC", PHP_FN(no_direct_constructor), NULL},
+ {"gdkgc", PHP_FN(no_direct_constructor), NULL},
{"set_dashes", PHP_FN(gdk_gc_set_dashes), NULL},
{NULL, NULL, NULL}
};
@@ -1573,7 +1583,8 @@
/* GdkDragContext */
static function_entry php_gdk_drag_context_functions[] = {
- {"gdkdragcontext", PHP_FN(wrap_no_direct_constructor), NULL},
+ {"GdkDragContext", PHP_FN(no_direct_constructor), NULL},
+ {"gdkdragcontext", PHP_FN(no_direct_constructor), NULL},
{NULL, NULL, NULL}
};
@@ -1671,7 +1682,8 @@
}
static function_entry php_gtk_selection_data_functions[] = {
- {"gdkselectiondata", PHP_FN(wrap_no_direct_constructor), NULL},
+ {"GdkSelectionData", PHP_FN(no_direct_constructor), NULL},
+ {"gdkselectiondata", PHP_FN(no_direct_constructor), NULL},
{"set", PHP_FN(gtk_selection_data_set), NULL},
{NULL, NULL, NULL}
};
@@ -1729,7 +1741,8 @@
/* GtkCtreeNode */
static function_entry php_gtk_ctree_node_functions[] = {
- {"gtkctreenode", PHP_FN(wrap_no_direct_constructor), NULL},
+ {"GtkCTreeNode", PHP_FN(no_direct_constructor), NULL},
+ {"gtkctreenode", PHP_FN(no_direct_constructor), NULL},
{NULL, NULL, NULL}
};
@@ -1882,6 +1895,7 @@
}
static function_entry php_gtk_accel_group_functions[] = {
+ {"GtkAccelGroup", PHP_FN(gtkaccelgroup), NULL},
{"gtkaccelgroup", PHP_FN(gtkaccelgroup), NULL},
{"lock", PHP_FN(gtk_accel_group_lock), NULL},
{"unlock", PHP_FN(gtk_accel_group_unlock), NULL},
@@ -1954,6 +1968,7 @@
}
static function_entry php_gtk_style_functions[] = {
+ {"GtkStyle", PHP_FN(gtkstyle), NULL},
{"gtkstyle", PHP_FN(gtkstyle), NULL},
{"copy", PHP_FN(gtk_style_copy), NULL},
{NULL, NULL, NULL}
@@ -2328,7 +2343,8 @@
/* GtkBoxChild */
static function_entry php_gtk_box_child_functions[] = {
- {"gtkboxchild", PHP_FN(wrap_no_direct_constructor), NULL},
+ {"GtkBoxChild", PHP_FN(no_direct_constructor), NULL},
+ {"gtkboxchild", PHP_FN(no_direct_constructor), NULL},
{NULL, NULL, NULL}
};
@@ -2383,7 +2399,8 @@
/* GtkFixedChild */
static function_entry php_gtk_fixed_child_functions[] = {
- {"gtkfixedchild", PHP_FN(wrap_no_direct_constructor), NULL},
+ {"GtkFixedChild", PHP_FN(no_direct_constructor), NULL},
+ {"gtkfixedchild", PHP_FN(no_direct_constructor), NULL},
{NULL, NULL, NULL}
};
@@ -2434,7 +2451,8 @@
/* GtkCListRow */
static function_entry php_gtk_clist_row_functions[] = {
- {"gtkclistrow", PHP_FN(wrap_no_direct_constructor), NULL},
+ {"GtkCListRow", PHP_FN(no_direct_constructor), NULL},
+ {"gtkclistrow", PHP_FN(no_direct_constructor), NULL},
{NULL, NULL, NULL}
};
@@ -2515,74 +2533,74 @@
INIT_CLASS_ENTRY(ce, "gdkevent", php_gdk_event_functions);
gdk_event_ce = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC);
- INIT_OVERLOADED_CLASS_ENTRY(ce, "gdkwindow", php_gdk_window_functions, NULL, php_gtk_get_property, php_gtk_set_property);
+ INIT_OVERLOADED_CLASS_ENTRY(ce, "GdkWindow", php_gdk_window_functions, NULL, php_gtk_get_property, php_gtk_set_property);
gdk_window_ce = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC);
- INIT_OVERLOADED_CLASS_ENTRY(ce, "gdkpixmap", php_gdk_pixmap_functions, NULL, php_gtk_get_property, php_gtk_set_property);
+ INIT_OVERLOADED_CLASS_ENTRY(ce, "GdkPixmap", php_gdk_pixmap_functions, NULL, php_gtk_get_property, php_gtk_set_property);
gdk_pixmap_ce = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC);
- INIT_OVERLOADED_CLASS_ENTRY(ce, "gdkbitmap", php_gdk_window_functions, NULL, php_gtk_get_property, php_gtk_set_property);
+ INIT_OVERLOADED_CLASS_ENTRY(ce, "GdkBitmap", php_gdk_window_functions, NULL, php_gtk_get_property, php_gtk_set_property);
gdk_bitmap_ce = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC);
php_gtk_register_prop_getter(gdk_window_ce, gdk_window_get_property);
php_gtk_register_prop_getter(gdk_pixmap_ce, gdk_window_get_property);
php_gtk_register_prop_getter(gdk_bitmap_ce, gdk_window_get_property);
- INIT_OVERLOADED_CLASS_ENTRY(ce, "gdkcolor", php_gdk_color_functions, NULL, php_gtk_get_property, php_gtk_set_property);
+ INIT_OVERLOADED_CLASS_ENTRY(ce, "GdkColor", php_gdk_color_functions, NULL, php_gtk_get_property, php_gtk_set_property);
gdk_color_ce = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC);
php_gtk_register_prop_getter(gdk_color_ce, gdk_color_get_property);
php_gtk_register_prop_setter(gdk_color_ce, gdk_color_set_property);
- INIT_OVERLOADED_CLASS_ENTRY(ce, "gdkcolormap", php_gdk_colormap_functions, NULL, php_gtk_get_property, php_gtk_set_property);
+ INIT_OVERLOADED_CLASS_ENTRY(ce, "GdkColormap", php_gdk_colormap_functions, NULL, php_gtk_get_property, php_gtk_set_property);
gdk_colormap_ce = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC);
php_gtk_register_prop_getter(gdk_colormap_ce, gdk_colormap_get_property);
- INIT_CLASS_ENTRY(ce, "gdkatom", php_gdk_atom_functions);
+ INIT_CLASS_ENTRY(ce, "GdkAtom", php_gdk_atom_functions);
gdk_atom_ce = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC);
- INIT_OVERLOADED_CLASS_ENTRY(ce, "gdkcursor", php_gdk_cursor_functions, NULL, php_gtk_get_property, php_gtk_set_property);
+ INIT_OVERLOADED_CLASS_ENTRY(ce, "GdkCursor", php_gdk_cursor_functions, NULL, php_gtk_get_property, php_gtk_set_property);
gdk_cursor_ce = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC);
php_gtk_register_prop_getter(gdk_cursor_ce, gdk_cursor_get_property);
- INIT_OVERLOADED_CLASS_ENTRY(ce, "gdkvisual", php_gdk_visual_functions, NULL, php_gtk_get_property, php_gtk_set_property);
+ INIT_OVERLOADED_CLASS_ENTRY(ce, "GdkVisual", php_gdk_visual_functions, NULL, php_gtk_get_property, php_gtk_set_property);
gdk_visual_ce = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC);
php_gtk_register_prop_getter(gdk_visual_ce, gdk_visual_get_property);
- INIT_OVERLOADED_CLASS_ENTRY(ce, "gdkfont", php_gdk_font_functions, NULL, php_gtk_get_property, php_gtk_set_property);
+ INIT_OVERLOADED_CLASS_ENTRY(ce, "GdkFont", php_gdk_font_functions, NULL, php_gtk_get_property, php_gtk_set_property);
gdk_font_ce = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC);
php_gtk_register_prop_getter(gdk_font_ce, gdk_font_get_property);
- INIT_OVERLOADED_CLASS_ENTRY(ce, "gdkgc", php_gdk_gc_functions, NULL, php_gtk_get_property, php_gtk_set_property);
+ INIT_OVERLOADED_CLASS_ENTRY(ce, "GdkGC", php_gdk_gc_functions, NULL, php_gtk_get_property, php_gtk_set_property);
gdk_gc_ce = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC);
php_gtk_register_prop_getter(gdk_gc_ce, gdk_gc_get_property);
php_gtk_register_prop_setter(gdk_gc_ce, gdk_gc_set_property);
- INIT_OVERLOADED_CLASS_ENTRY(ce, "gdkdragcontext", php_gdk_drag_context_functions, NULL, php_gtk_get_property, php_gtk_set_property);
+ INIT_OVERLOADED_CLASS_ENTRY(ce, "GdkDragContext", php_gdk_drag_context_functions, NULL, php_gtk_get_property, php_gtk_set_property);
gdk_drag_context_ce = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC);
php_gtk_register_prop_getter(gdk_drag_context_ce, gdk_drag_context_get_property);
- INIT_OVERLOADED_CLASS_ENTRY(ce, "gtkselectiondata", php_gtk_selection_data_functions, NULL, php_gtk_get_property, php_gtk_set_property);
+ INIT_OVERLOADED_CLASS_ENTRY(ce, "GtkSelectionData", php_gtk_selection_data_functions, NULL, php_gtk_get_property, php_gtk_set_property);
gtk_selection_data_ce = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC);
php_gtk_register_prop_getter(gtk_selection_data_ce, gtk_selection_data_get_property);
- INIT_OVERLOADED_CLASS_ENTRY(ce, "gtkctreenode", php_gtk_ctree_node_functions, NULL, php_gtk_get_property, php_gtk_set_property);
+ INIT_OVERLOADED_CLASS_ENTRY(ce, "GtkCTreeNode", php_gtk_ctree_node_functions, NULL, php_gtk_get_property, php_gtk_set_property);
gtk_ctree_node_ce = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC);
php_gtk_register_prop_getter(gtk_ctree_node_ce, gtk_ctree_node_get_property);
- INIT_CLASS_ENTRY(ce, "gtkaccelgroup", php_gtk_accel_group_functions);
+ INIT_CLASS_ENTRY(ce, "GtkAccelGroup", php_gtk_accel_group_functions);
gtk_accel_group_ce = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC);
- INIT_OVERLOADED_CLASS_ENTRY(ce, "gtkstyle", php_gtk_style_functions, NULL, php_gtk_get_property, php_gtk_set_property);
+ INIT_OVERLOADED_CLASS_ENTRY(ce, "GtkStyle", php_gtk_style_functions, NULL, php_gtk_get_property, php_gtk_set_property);
gtk_style_ce = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC);
php_gtk_register_prop_getter(gtk_style_ce, gtk_style_get_property);
php_gtk_register_prop_setter(gtk_style_ce, gtk_style_set_property);
- INIT_OVERLOADED_CLASS_ENTRY(ce, "gtkboxchild", NULL, NULL, php_gtk_get_property, php_gtk_set_property);
+ INIT_OVERLOADED_CLASS_ENTRY(ce, "GtkBoxChild", NULL, NULL, php_gtk_get_property, php_gtk_set_property);
gtk_box_child_ce = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC);
php_gtk_register_prop_getter(gtk_box_child_ce, gtk_box_child_get_property);
- INIT_OVERLOADED_CLASS_ENTRY(ce, "gtkfixedchild", NULL, NULL, php_gtk_get_property, php_gtk_set_property);
+ INIT_OVERLOADED_CLASS_ENTRY(ce, "GtkFixedChild", NULL, NULL, php_gtk_get_property, php_gtk_set_property);
gtk_fixed_child_ce = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC);
php_gtk_register_prop_getter(gtk_fixed_child_ce, gtk_fixed_child_get_property);
- INIT_OVERLOADED_CLASS_ENTRY(ce, "gtkclistrow", NULL, NULL, php_gtk_get_property, php_gtk_set_property);
+ INIT_OVERLOADED_CLASS_ENTRY(ce, "GtkCListRow", NULL, NULL, php_gtk_get_property, php_gtk_set_property);
gtk_clist_row_ce = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC);
php_gtk_register_prop_getter(gtk_clist_row_ce, gtk_clist_row_get_property);
}
Index: php-gtk/ext/libglade/libglade.overrides
diff -u php-gtk/ext/libglade/libglade.overrides:1.5 php-gtk/ext/libglade/libglade.overrides:1.6
--- php-gtk/ext/libglade/libglade.overrides:1.5 Fri Aug 10 12:15:56 2001
+++ php-gtk/ext/libglade/libglade.overrides Fri Aug 10 23:28:20 2001
@@ -75,13 +75,13 @@
RETURN_NULL();
}
-PHP_FUNCTION(wrap_glade_xml_signal_connect)
+PHP_FUNCTION(glade_xml_signal_connect)
{
glade_signal_connect_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
}
%%
override glade_xml_signal_connect_object signal_connect_object GladeXML
-PHP_FUNCTION(wrap_glade_xml_signal_connect_object)
+PHP_FUNCTION(glade_xml_signal_connect_object)
{
glade_signal_connect_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
}
@@ -167,13 +167,13 @@
(GladeXMLConnectFunc)glade_connect_auto, ac_data);
}
-PHP_FUNCTION(wrap_glade_xml_signal_autoconnect)
+PHP_FUNCTION(glade_xml_signal_autoconnect)
{
glade_signal_autoconnect_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
}
%%
override glade_xml_signal_autoconnect_object signal_autoconnect_object GladeXML
-PHP_FUNCTION(wrap_glade_xml_signal_autoconnect_object)
+PHP_FUNCTION(glade_xml_signal_autoconnect_object)
{
glade_signal_autoconnect_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
}
Index: php-gtk/generator/generator.php
diff -u php-gtk/generator/generator.php:1.26 php-gtk/generator/generator.php:1.27
--- php-gtk/generator/generator.php:1.26 Tue Jul 31 01:27:01 2001
+++ php-gtk/generator/generator.php Fri Aug 10 23:28:20 2001
@@ -19,7 +19,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/* $Id: generator.php,v 1.26 2001/07/31 05:27:01 andrei Exp $ */
+/* $Id: generator.php,v 1.27 2001/08/11 03:28:20 andrei Exp $ */
/*
* Significant portions of this generator are based on the pygtk code generator
@@ -39,6 +39,7 @@
var $parser = null;
var $overrides = null;
var $prefix = null;
+ var $lprefix = null;
var $constants = '';
var $register_classes = '';
@@ -50,6 +51,7 @@
$this->parser = &$parser;
$this->overrides = &$overrides;
$this->prefix = $prefix;
+ $this->lprefix = strtolower($prefix);
}
function register_types($parser = null)
@@ -75,7 +77,7 @@
function write_constants($fp)
{
- fwrite($fp, "\nvoid php_". $this->prefix . "_register_constants(int module_number TSRMLS_DC)\n");
+ fwrite($fp, "\nvoid php_". $this->lprefix . "_register_constants(int module_number TSRMLS_DC)\n");
fwrite($fp, "{\n");
foreach ($this->parser->enums as $enum) {
if ($this->overrides->is_ignored($enum->c_name)) continue;
@@ -350,7 +352,7 @@
fwrite($fp, "\n/* struct $struct->c_name */\n");
$this->register_classes .= sprintf($struct_class_tpl,
- $struct_module . $struct_lname,
+ $struct->in_module . $struct->name,
$struct_module . '_' . $struct_lname);
$this->register_classes .= sprintf($register_class_tpl, $struct->ce, 'NULL');
@@ -409,6 +411,10 @@
implode('', $construct_prop_code)));
$functions_decl = sprintf($functions_decl_tpl, $struct_module . '_' . $struct_lname);
$functions_decl .= sprintf($function_entry_tpl,
+ $struct->in_module . $struct->name,
+ strtolower($struct->c_name),
+ 'NULL');
+ $functions_decl .= sprintf($function_entry_tpl,
$struct_module . $struct_lname,
strtolower($struct->c_name),
'NULL');
@@ -432,7 +438,7 @@
fwrite($fp, "\n/* object $object->c_name */\n");
$this->register_classes .= sprintf($init_class_tpl,
- $object_module . $object_lname,
+ $object->in_module . $object->name,
$object_module . '_' . $object_lname,
count($object->fields) ? 'php_gtk_get_property' : 'NULL');
if ($object->parent === null)
@@ -458,23 +464,37 @@
$constructor = $this->parser->find_constructor($object);
if (!$constructor || $this->overrides->is_ignored($constructor->c_name)) {
$functions_decl .= sprintf($function_entry_tpl,
- strtolower($object->c_name),
+ $object->in_module . $object->name,
+ 'no_constructor', 'NULL');
+ $functions_decl .= sprintf($function_entry_tpl,
+ $object_module . $object_lname,
'no_constructor', 'NULL');
} else if ($this->overrides->is_overriden($constructor->c_name)) {
list(, $constructor_override) = $this->overrides->get_override($constructor->c_name);
fwrite($fp, $constructor_override . "\n");
$functions_decl .= sprintf($function_entry_tpl,
+ $constructor->is_constructor_of,
+ strtolower($constructor->c_name),
+ 'NULL');
+ $functions_decl .= sprintf($function_entry_tpl,
strtolower($constructor->is_constructor_of),
strtolower($constructor->c_name),
'NULL');
} else if (!$this->overrides->is_ignored($constructor->c_name)) {
if ($this->write_constructor($fp, $object->c_name, $constructor)) {
$functions_decl .= sprintf($function_entry_tpl,
+ $constructor->is_constructor_of,
+ strtolower($constructor->c_name),
+ 'NULL');
+ $functions_decl .= sprintf($function_entry_tpl,
strtolower($constructor->is_constructor_of),
strtolower($constructor->c_name),
'NULL');
} else {
$functions_decl .= sprintf($function_entry_tpl,
+ $constructor->is_constructor_of,
+ 'no_constructor', 'NULL');
+ $functions_decl .= sprintf($function_entry_tpl,
strtolower($constructor->is_constructor_of),
'no_constructor', 'NULL');
}
@@ -542,19 +562,19 @@
$this->register_classes .= sprintf($init_class_tpl,
$this->prefix,
- $this->prefix,
+ $this->lprefix,
'NULL');
$this->register_classes .= sprintf($register_class_tpl,
- $this->prefix . '_ce',
+ $this->lprefix . '_ce',
'NULL');
- $functions_decl = sprintf($functions_decl_tpl, $this->prefix);
+ $functions_decl = sprintf($functions_decl_tpl, $this->lprefix);
foreach ($this->parser->functions as $function) {
if ($this->overrides->is_overriden($function->c_name)) {
list($function_name, $function_override) = $this->overrides->get_override($function->c_name);
fwrite($fp, $function_override . "\n");
if ($function->name == $function->c_name)
- $function_name = substr($function->name, strlen($this->prefix) + 1);
+ $function_name = substr($function->name, strlen($this->lprefix) + 1);
else
$function_name = $function->name;
$functions_decl .= sprintf($function_entry_tpl,
@@ -565,7 +585,7 @@
else if (!$this->overrides->is_ignored($function->c_name)) {
if ($this->write_function($fp, $function)) {
if ($function->name == $function->c_name)
- $function_name = substr($function->name, strlen($this->prefix) + 1);
+ $function_name = substr($function->name, strlen($this->lprefix) + 1);
else
$function_name = $function->name;
$functions_decl .= sprintf($function_entry_tpl,
@@ -583,7 +603,7 @@
{
global $class_entry_tpl;
- fwrite($fp, sprintf($class_entry_tpl, $this->prefix . '_ce'));
+ fwrite($fp, sprintf($class_entry_tpl, $this->lprefix . '_ce'));
foreach ($this->parser->structs as $struct)
fwrite($fp, sprintf($class_entry_tpl, $struct->ce));
foreach ($this->parser->objects as $object)
@@ -606,7 +626,7 @@
$this->write_structs($fp);
$this->write_objects($fp);
fwrite($fp, sprintf($register_classes_tpl,
- $this->prefix,
+ $this->lprefix,
$this->register_classes));
fwrite($fp, "\n#endif /* HAVE_PHP_GTK */\n");
fclose($fp);
@@ -628,7 +648,7 @@
chdir('..');
-$prefix = 'gtk';
+$prefix = 'Gtk';
$overrides = new Overrides();
foreach ($opts as $opt) {
Index: php-gtk/generator/templates.php
diff -u php-gtk/generator/templates.php:1.16 php-gtk/generator/templates.php:1.17
--- php-gtk/generator/templates.php:1.16 Tue Aug 7 00:54:33 2001
+++ php-gtk/generator/templates.php Fri Aug 10 23:28:20 2001
@@ -19,10 +19,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/* $Id: templates.php,v 1.16 2001/08/07 04:54:33 fmk Exp $ */
+/* $Id: templates.php,v 1.17 2001/08/11 03:28:20 andrei Exp $ */
$function_tpl = "
-PHP_FUNCTION(wrap_%s)
+PHP_FUNCTION(%s)
{
%s if (!php_gtk_parse_args(ZEND_NUM_ARGS(), \"%s\"%s))
return;
@@ -33,7 +33,7 @@
$function_call_tpl = "%s(%s)";
$method_tpl = "
-PHP_FUNCTION(wrap_%s)
+PHP_FUNCTION(%s)
{
%s NOT_STATIC_METHOD();
@@ -46,7 +46,7 @@
$method_call_tpl = "%s(%s(PHP_GTK_GET(this_ptr))%s)";
$constructor_tpl = "
-PHP_FUNCTION(wrap_%s)
+PHP_FUNCTION(%s)
{
%s NOT_STATIC_METHOD();
@@ -66,7 +66,7 @@
%s
}\n\n";
-$function_entry_tpl = "\t{\"%s\", PHP_FN(wrap_%s), %s},\n";
+$function_entry_tpl = "\t{\"%s\", PHP_FN(%s), %s},\n";
$functions_decl_tpl = "
static function_entry php_%s_functions[] = {
";
@@ -97,7 +97,7 @@
INIT_CLASS_ENTRY(ce, \"%s\", php_%s_functions);\n";
$get_type_tpl = "
-PHP_FUNCTION(wrap_%s_get_type)
+PHP_FUNCTION(%s_get_type)
{
if (!php_gtk_parse_args(ZEND_NUM_ARGS(), \"\"))
return;
@@ -138,7 +138,7 @@
}\n\n";
$struct_construct_tpl = "
-PHP_FUNCTION(wrap_%s)
+PHP_FUNCTION(%s)
{
%s NOT_STATIC_METHOD();
Index: php-gtk/main/php_gtk.c
diff -u php-gtk/main/php_gtk.c:1.17 php-gtk/main/php_gtk.c:1.18
--- php-gtk/main/php_gtk.c:1.17 Wed Aug 8 16:49:09 2001
+++ php-gtk/main/php_gtk.c Fri Aug 10 23:28:20 2001
@@ -18,7 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/* $Id: php_gtk.c,v 1.17 2001/08/08 20:49:09 andrei Exp $: */
+/* $Id: php_gtk.c,v 1.18 2001/08/11 03:28:20 andrei Exp $: */
#include "php_gtk.h"
#include "SAPI.h"
@@ -124,13 +124,13 @@
*/
}
-PHP_FUNCTION(wrap_no_constructor)
+PHP_FUNCTION(no_constructor)
{
php_error(E_WARNING, "%s: An abstract or unimplemented class", get_active_function_name(TSRMLS_C));
php_gtk_invalidate(this_ptr);
}
-PHP_FUNCTION(wrap_no_direct_constructor)
+PHP_FUNCTION(no_direct_constructor)
{
php_error(E_WARNING, "Class %s cannot be constructed directly", get_active_function_name(TSRMLS_C));
php_gtk_invalidate(this_ptr);
Index: php-gtk/main/php_gtk.h
diff -u php-gtk/main/php_gtk.h:1.48 php-gtk/main/php_gtk.h:1.49
--- php-gtk/main/php_gtk.h:1.48 Tue Jul 31 17:12:32 2001
+++ php-gtk/main/php_gtk.h Fri Aug 10 23:28:20 2001
@@ -18,7 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/* $Id: php_gtk.h,v 1.48 2001/07/31 21:12:32 andrei Exp $: */
+/* $Id: php_gtk.h,v 1.49 2001/08/11 03:28:20 andrei Exp $: */
#ifndef _PHP_GTK_H
#define _PHP_GTK_H
@@ -131,8 +131,8 @@
return; \
}
-PHP_FUNCTION(wrap_no_constructor);
-PHP_FUNCTION(wrap_no_direct_constructor);
+PHP_FUNCTION(no_constructor);
+PHP_FUNCTION(no_direct_constructor);
extern char *php_gtk_zval_type_name(zval *arg);