Description: update for Gauche 0.9 Author: NIIBE Yutaka Reviewed-By: NIIBE Yutaka Last-Update: 2010-03-19 --- gauche-gtk-0.4.1.orig/src/gauche-gtk.c 2004-03-19 06:21:37.000000000 +0900 +++ gauche-gtk-0.4.1/src/gauche-gtk.c 2010-03-17 17:35:00.000000000 +0900 @@ -447,7 +447,7 @@ { ScmObj sargs = SCM_OBJ(data); SCM_ASSERT(SCM_PAIRP(sargs)); - return Scm_Apply(SCM_CAR(sargs), SCM_CDR(sargs)); + return Scm_ApplyRec(SCM_CAR(sargs), SCM_CDR(sargs)); } static SCM_DEFINE_STRING_CONST(callcallback_thunk__NAME, "%gtk-call-callback-thunk", 24, 24); @@ -665,7 +665,7 @@ for (i=0; isignalPending) + static gboolean scm_signal_check(GSource *source) { ScmVM *vm = Scm_VM(); --- gauche-gtk-0.4.1.orig/glgd/glgdGraph.c +++ gauche-gtk-0.4.1/glgd/glgdGraph.c @@ -590,7 +590,7 @@ glgdGraphMouseButtonCB(GtkWidget *widget fn = graph->fn[GLGDGRAPH_FN_MOUSE_LEFT]; if (fn && event->button == 1) { - Scm_Apply(fn, SCM_LIST4( + Scm_ApplyRec(fn, SCM_LIST4( SCM_OBJ(SCM_MAKE_GLGD_GRAPH(graph)), SCM_OBJ(SCM_MAKE_GLGD_NODE(graph->hoverNode)), SCM_OBJ(SCM_MAKE_GLGD_LINK(graph->hoverLink)), @@ -599,7 +599,7 @@ glgdGraphMouseButtonCB(GtkWidget *widget fn = graph->fn[GLGDGRAPH_FN_MOUSE_MIDDLE]; if (fn && event->button == 2) { - Scm_Apply(fn, SCM_LIST4( + Scm_ApplyRec(fn, SCM_LIST4( SCM_OBJ(SCM_MAKE_GLGD_GRAPH(graph)), SCM_OBJ(SCM_MAKE_GLGD_NODE(graph->hoverNode)), SCM_OBJ(SCM_MAKE_GLGD_LINK(graph->hoverLink)), @@ -608,7 +608,7 @@ glgdGraphMouseButtonCB(GtkWidget *widget fn = graph->fn[GLGDGRAPH_FN_MOUSE_RIGHT]; if (fn && event->button == 3) { - Scm_Apply(fn, SCM_LIST4( + Scm_ApplyRec(fn, SCM_LIST4( SCM_OBJ(SCM_MAKE_GLGD_GRAPH(graph)), SCM_OBJ(SCM_MAKE_GLGD_NODE(graph->hoverNode)), SCM_OBJ(SCM_MAKE_GLGD_LINK(graph->hoverLink)), @@ -695,7 +695,7 @@ glgdGraphMouseMotionCB(GtkWidget *widget fn = graph->fn[GLGDGRAPH_FN_MOUSE_HOVER]; if (fn) { - Scm_Apply(fn, SCM_LIST4( + Scm_ApplyRec(fn, SCM_LIST4( SCM_OBJ(SCM_MAKE_GLGD_GRAPH(graph)), SCM_OBJ(SCM_MAKE_GLGD_NODE(graph->hoverNode)), SCM_OBJ(SCM_MAKE_GLGD_LINK(graph->hoverLink)), @@ -742,7 +742,7 @@ glgdGraphMouseScrollCB(GtkWidget *widget fn = graph->fn[GLGDGRAPH_FN_MOUSE_SCROLL]; if (fn) { - Scm_Apply(fn, SCM_LIST4( + Scm_ApplyRec(fn, SCM_LIST4( SCM_OBJ(SCM_MAKE_GLGD_GRAPH(graph)), SCM_OBJ(SCM_MAKE_GLGD_NODE(graph->hoverNode)), SCM_OBJ(SCM_MAKE_GLGD_LINK(graph->hoverLink)), @@ -794,7 +794,7 @@ glgdGraphKeyCB(GtkWidget *widget, GdkEve keyFn = graph->fn[GLGDGRAPH_FN_KEY]; if (keyFn != NULL) { - Scm_Apply(keyFn, SCM_LIST4( + Scm_ApplyRec(keyFn, SCM_LIST4( SCM_OBJ(SCM_MAKE_GLGD_GRAPH(graph)), SCM_OBJ(SCM_MAKE_GLGD_NODE(graph->hoverNode)), SCM_OBJ(SCM_MAKE_GLGD_LINK(graph->hoverLink)), --- gauche-gtk-0.4.1.orig/glgd/glgdNode.c 2004-03-15 04:54:24.000000000 +0900 +++ gauche-gtk-0.4.1/glgd/glgdNode.c 2010-03-17 17:55:36.000000000 +0900 @@ -207,7 +207,7 @@ { if (prFn != NULL) { - Scm_Apply(prFn, SCM_LIST1(SCM_OBJ(SCM_MAKE_GLGD_NODE(node)))); + Scm_ApplyRec(prFn, SCM_LIST1(SCM_OBJ(SCM_MAKE_GLGD_NODE(node)))); } glgdNodeDrawBox(node, dim, renderMode); --- gauche-gtk-0.4.1.orig/src/gtk-lib.hints 2010-03-19 13:45:26.000000000 +0900 +++ gauche-gtk-0.4.1/src/gtk-lib.hints 2010-03-19 14:07:27.000000000 +0900 @@ -66,7 +66,7 @@ "static gboolean accel_group_finder(GtkAccelKey *key, GClosure *clo, gpointer data) { - ScmObj r = Scm_Apply(SCM_OBJ(data), SCM_LIST1(SCM_MAKE_GTK_ACCEL_KEY(key))); + ScmObj r = Scm_ApplyRec(SCM_OBJ(data), SCM_LIST1(SCM_MAKE_GTK_ACCEL_KEY(key))); return (!SCM_FALSEP(r)); }") @@ -990,7 +990,7 @@ SCM_RETURN(SCM_UNDEFINED);")) (define-cproc gtk-radio-group->list (group::) - (return "Scm_GtkRadioGroupToList")) + Scm_GtkRadioGroupToList) ;;================================================================== ;; gtkradiomenuitem @@ -1426,7 +1426,7 @@ GtkTreeIter *iter, gpointer data) { - Scm_Apply(SCM_OBJ(data), + Scm_ApplyRec(SCM_OBJ(data), SCM_LIST3(SCM_MAKE_GTK_TREE_MODEL(model), SCM_MAKE_GTK_TREE_PATH(path), SCM_MAKE_GTK_TREE_ITER(iter))); @@ -1640,50 +1640,50 @@ ;; these defined as macro in C (define-cproc gtk-widget-flags (widget::) - (return "GTK_WIDGET_FLAGS")) + :: GTK_WIDGET_FLAGS) (define-cproc gtk-widget-toplevel? (widget::) - (return "GTK_WIDGET_TOPLEVEL")) + :: GTK_WIDGET_TOPLEVEL) (define-cproc gtk-widget-no-window? (widget::) - (return "GTK_WIDGET_NO_WINDOW")) + :: GTK_WIDGET_NO_WINDOW) (define-cproc gtk-widget-realized? (widget::) - (return "GTK_WIDGET_REALIZED")) + :: GTK_WIDGET_REALIZED) (define-cproc gtk-widget-mapped? (widget::) - (return "GTK_WIDGET_MAPPED")) + :: GTK_WIDGET_MAPPED) (define-cproc gtk-widget-visible? (widget::) - (return "GTK_WIDGET_VISIBLE")) + :: GTK_WIDGET_VISIBLE) (define-cproc gtk-widget-drawable? (widget::) - (return "GTK_WIDGET_DRAWABLE")) + :: GTK_WIDGET_DRAWABLE) (define-cproc gtk-widget-sensitive? (widget::) - (return "GTK_WIDGET_SENSITIVE")) + :: GTK_WIDGET_SENSITIVE) (define-cproc gtk-widget-parent-sensitive? (widget::) - (return "GTK_WIDGET_PARENT_SENSITIVE")) + :: GTK_WIDGET_PARENT_SENSITIVE) (define-cproc gtk-widget-is-sensitive? (widget::) - (return "GTK_WIDGET_IS_SENSITIVE")) + :: GTK_WIDGET_IS_SENSITIVE) (define-cproc gtk-widget-can-focus? (widget::) - (return "GTK_WIDGET_CAN_FOCUS")) + :: GTK_WIDGET_CAN_FOCUS) (define-cproc gtk-widget-has-focus? (widget::) - (return "GTK_WIDGET_HAS_FOCUS")) + :: GTK_WIDGET_HAS_FOCUS) (define-cproc gtk-widget-can-default? (widget::) - (return "GTK_WIDGET_CAN_DEFAULT")) + :: GTK_WIDGET_CAN_DEFAULT) (define-cproc gtk-widget-has-default? (widget::) - (return "GTK_WIDGET_HAS_DEFAULT")) + :: GTK_WIDGET_HAS_DEFAULT) (define-cproc gtk-widget-has-grab? (widget::) - (return "GTK_WIDGET_HAS_GRAB")) + :: GTK_WIDGET_HAS_GRAB) (define-cproc gtk-widget-rc-style? (widget::) - (return "GTK_WIDGET_RC_STYLE")) + :: GTK_WIDGET_RC_STYLE) (define-cproc gtk-widget-composite-child? (widget::) - (return "GTK_WIDGET_COMPOSITE_CHILD")) + :: GTK_WIDGET_COMPOSITE_CHILD) (define-cproc gtk-widget-app-paintable? (widget::) - (return "GTK_WIDGET_APP_PAINTABLE")) + :: GTK_WIDGET_APP_PAINTABLE) (define-cproc gtk-widget-receives-default? (widget::) - (return "GTK_WIDGET_RECEIVES_DEFAULT")) + :: GTK_WIDGET_RECEIVES_DEFAULT) (define-cproc gtk-widget-double-buffered? (widget::) - (return "GTK_WIDGET_DOUBLE_BUFFERED")) + :: GTK_WIDGET_DOUBLE_BUFFERED) (define-cproc gtk-widget-set-flags (widget:: flag::) - (return "GTK_WIDGET_SET_FLAGS")) + :: GTK_WIDGET_SET_FLAGS) (define-cproc gtk-widget-unset-flags (widget:: flag::) - (return "GTK_WIDGET_UNSET_FLAGS")) + :: GTK_WIDGET_UNSET_FLAGS) (define-cproc-fix gtk-widget-list-accel-closures (fix-body! "GList *lis = gtk_widget_list_accel_closures(widget); --- gauche-gtk-0.4.1.orig/src/h2stub.scm 2010-03-18 11:46:03.000000000 +0900 +++ gauche-gtk-0.4.1/src/h2stub.scm 2010-03-18 11:50:04.000000000 +0900 @@ -1099,7 +1099,7 @@ '())) (sig `(define-cproc ,s-name ,args ,(or (body-of self) - `(return ,@ret ,(x->string (c-name-of self)))))) + `(call ,@ret ,(x->string (c-name-of self)))))) ) (if unknown-arg? (print (commenter sig)) --- gauche-gtk-0.4.1.orig/src/gauche-glib.stub 2003-01-20 11:37:21.000000000 +0900 +++ gauche-gtk-0.4.1/src/gauche-glib.stub 2010-03-18 12:16:56.000000000 +0900 @@ -75,15 +75,15 @@ (define-cproc g-signal-handler-disconnect (object:: id::) - (return "g_signal_handler_disconnect")) + :: g_signal_handler_disconnect) (define-cproc g-signal-handler-block (object:: id::) - (return "g_signal_handler_block")) + :: g_signal_handler_block) (define-cproc g-signal-handler-unblock (object:: id::) - (return "g_signal_handler_unblock")) + :: g_signal_handler_unblock) ;; NB: no block_by_func or unblock_by_func. @@ -95,20 +95,16 @@ () ()) -(define-cproc g-timer-new () - (return "g_timer_new")) +(define-cproc g-timer-new () :: g_timer_new) -(define-cproc g-timer-start (timer::) - (return "g_timer_start")) +(define-cproc g-timer-start (timer::) :: g_timer_start) -(define-cproc g-timer-stop (timer::) - (return "g_timer_stop")) +(define-cproc g-timer-stop (timer::) :: g_timer_stop) (define-cproc g-timer-elapsed (timer::) "SCM_RETURN(Scm_MakeFlonum(g_timer_elapsed(timer, NULL)));") -(define-cproc g-timer-reset (timer::) - (return "g_timer_reset")) +(define-cproc g-timer-reset (timer::) :: g_timer_reset) ;; Local variables: ;; mode: scheme --- gauche-gtk-0.4.1.orig/src/pango-lib.hints 2004-06-27 12:49:05.000000000 +0900 +++ gauche-gtk-0.4.1/src/pango-lib.hints 2010-03-18 12:39:30.000000000 +0900 @@ -361,8 +361,7 @@ (define-enum PANGO_SCALE) ;; These are macros in C -(define-cproc pango-pixels (d::) - (return "PANGO_PIXELS")) +(define-cproc pango-pixels (d::) :: PANGO_PIXELS) (define-cproc pango-ascent (rect::) "SCM_RETURN(SCM_MAKE_INT(PANGO_ASCENT(*rect)));") --- gauche-gtk-0.4.1.orig/glgd/glgdlib.stub 2004-03-15 05:59:49.000000000 +0900 +++ gauche-gtk-0.4.1/glgd/glgdlib.stub 2010-03-18 12:33:52.000000000 +0900 @@ -35,108 +35,102 @@ (define-enum GLGDNODE_FLAG_SELECTED) (define-cproc glgd-node-create () - (return "glgdNodeCreate")) + :: glgdNodeCreate) (define-cproc glgd-node-destroy (node::) - (return "glgdNodeDestroy")) + :: glgdNodeDestroy) (define-cproc glgd-node-init (node::) - (return "glgdNodeInit")) + :: glgdNodeInit) (define-cproc glgd-node-label-set (node:: label::) - (return "glgdNodeLabelSet")) + :: glgdNodeLabelSet) -(define-cproc glgd-node-label-get (node::) - (return "glgdNodeLabelGet")) +(define-cproc glgd-node-label-get (node::) glgdNodeLabelGet) (define-cproc glgd-node-data-set (node:: data) - (return "glgdNodeDataSet")) + :: glgdNodeDataSet) -(define-cproc glgd-node-data-get (node::) - (return "glgdNodeDataGet")) +(define-cproc glgd-node-data-get (node::) glgdNodeDataGet) (define-cproc glgd-node-id-set (node:: id::) - (return "glgdNodeIDSet")) + :: glgdNodeIDSet) -(define-cproc glgd-node-id-get (node::) - (return "glgdNodeIDGet")) +(define-cproc glgd-node-id-get (node::) :: glgdNodeIDGet) (define-cproc glgd-node-info-set (node:: label:: id::) - (return "glgdNodeInfoSet")) + :: glgdNodeInfoSet) (define-cproc glgd-node-flags-set (node:: mask:: flagop::) - (return "glgdNodeFlagsSet")) + :: glgdNodeFlagsSet) (define-cproc glgd-node-is-selected (node::) - (return "glgdNodeIsSelected")) + :: glgdNodeIsSelected) (define-cproc glgd-node-color-default (r:: g:: b:: a::) - (return "glgdNodeColorDefault")) + :: glgdNodeColorDefault) (define-cproc glgd-node-color-set (node:: r:: g:: b:: a::) - (return "glgdNodeColorSetByList")) + :: glgdNodeColorSetByList) (define-cproc glgd-node-attribute-clear (node::) - (return "glgdNodeAttributeClear")) + :: glgdNodeAttributeClear) (define-cproc glgd-node-attribute-set (node:: attrNdx::) - (return "glgdNodeAttributeSet")) + :: glgdNodeAttributeSet) (define-cproc glgd-node-attribute-reset (node:: attrNdx::) - (return "glgdNodeAttributeReset")) + :: glgdNodeAttributeReset) (define-cproc glgd-node-attribute-is-set (node:: attrNdx::) - (return "glgdNodeAttributeIsSet")) + :: glgdNodeAttributeIsSet) ;;================================================================= ;; glgdLink.h ;; -(define-cproc glgd-link-create () - (return "glgdLinkCreate")) +(define-cproc glgd-link-create () :: glgdLinkCreate) (define-cproc glgd-link-destroy (link::) - (return "glgdLinkDestroy")) + :: glgdLinkDestroy) -(define-cproc glgd-link-init (link::) - (return "glgdLinkInit")) +(define-cproc glgd-link-init (link::) :: glgdLinkInit) (define-cproc glgd-link-set (link:: src:: dst::) - (return "glgdLinkSet")) + :: glgdLinkSet) (define-cproc glgd-link-flags-set (link:: mask:: flagop::) - (return "glgdLinkFlagsSet")) + :: glgdLinkFlagsSet) -(define-cproc glgd-link-list-create () - (return "glgdLinkListCreate")) +(define-cproc glgd-link-list-create () :: glgdLinkListCreate) (define-cproc glgd-link-list-destroy (list::) - (return "glgdLinkListDestroy")) + :: glgdLinkListDestroy) (define-cproc glgd-link-list-init (list::) - (return "glgdLinkListInit")) + :: glgdLinkListInit) (define-cproc glgd-link-list-flags-set (list:: mask:: flagop::) - (return "glgdLinkListFlagsSet")) + :: glgdLinkListFlagsSet) ;;================================================================= ;; glgdGraph.h @@ -152,147 +146,138 @@ (define-enum GLGDGRAPH_FLAG_ESCPRESSED) (define-enum GLGDGRAPH_FLAG_PANGOBOLD) -(define-cproc glgd-graph-create () - (return "glgdGraphCreate")) +(define-cproc glgd-graph-create () :: glgdGraphCreate) (define-cproc glgd-graph-destroy (graph::) - (return "glgdGraphDestroy")) + :: glgdGraphDestroy) -(define-cproc glgd-graph-init (graph::) - (return "glgdGraphInit")) +(define-cproc glgd-graph-init (graph::) :: glgdGraphInit) -(define-cproc glgd-graph-fini (graph::) - (return "glgdGraphFini")) +(define-cproc glgd-graph-fini (graph::) :: glgdGraphFini) -(define-cproc glgd-graph-draw (graph::) - (return "glgdGraphDraw")) +(define-cproc glgd-graph-draw (graph::) :: glgdGraphDraw) -(define-cproc glgd-graph-frame (graph::) - (return "glgdGraphFrame")) +(define-cproc glgd-graph-frame (graph::) :: glgdGraphFrame) (define-cproc glgd-graph-invalidate (graph::) - (return "glgdGraphInvalidate")) + :: glgdGraphInvalidate) (define-cproc glgd-graph-reshape (graph::) - (return "glgdGraphReshape")) + :: glgdGraphReshape) ;; NB: the three-argument variant is kept only for backward compatibility. (define-cproc glgd-graph-connect (graph:: widget:: &optional w2) - "int r; - if (SCM_UNBOUNDP(w2)) { - r = glgdGraphConnect(graph, widget); - } else { - r = glgdGraphConnect3(graph, widget, w2); - } - SCM_RETURN(SCM_MAKE_BOOL(r));") + :: + (if (SCM_UNBOUNDP w2) + (glgdGraphConnect graph widget) + (glgdGraphConnect3 graph widget w2))) (define-cproc glgd-graph-translate (graph:: x:: y::) - (return "glgdGraphTranslate")) + :: glgdGraphTranslate) (define-cproc glgd-graph-center (graph::) - (return "glgdGraphCenter")) + :: glgdGraphCenter) (define-cproc glgd-graph-auto-organize (graph:: x:: y::) - (return "glgdGraphAutoOrganizeXY")) + :: glgdGraphAutoOrganizeXY) (define-cproc glgd-graph-node-by-id (graph:: node-id::) - (return "glgdGraphNodeByID")) + :: glgdGraphNodeByID) (define-cproc glgd-graph-node-selected (graph:: select-index::) - (return "glgdGraphNodeSelected")) + :: glgdGraphNodeSelected) (define-cproc glgd-graph-node-select-count (graph::) - (return "glgdGraphNodeSelectCount")) + :: glgdGraphNodeSelectCount) (define-cproc glgd-graph-node-count (graph::) - (return "glgdGraphNodeCount")) + :: glgdGraphNodeCount) (define-cproc glgd-graph-node-add (graph:: node::) - (return "glgdGraphNodeAdd")) + :: glgdGraphNodeAdd) (define-cproc glgd-graph-node-list-flag (graph:: flag-mask:: flag-op::) - (return "glgdGraphNodeListFlag")) + :: glgdGraphNodeListFlag) (define-cproc glgd-graph-link-list-add (graph:: list::) - (return "glgdGraphLinkListAdd")) + :: glgdGraphLinkListAdd) (define-cproc glgd-graph-link-list-dump (graph::) - (return "glgdGraphLinkListDump")) + :: glgdGraphLinkListDump) (define-cproc glgd-graph-link-add (graph:: list:: link::) - (return "glgdGraphLinkAdd")) + :: glgdGraphLinkAdd) (define-cproc glgd-graph-link-index (graph:: link::) - (return "glgdGraphLinkNdx")) + :: glgdGraphLinkNdx) (define-cproc glgd-graph-link-by-index (graph:: index::) - (return "glgdGraphLinkByNdx")) + :: glgdGraphLinkByNdx) (define-cproc glgd-graph-callback-set (graph:: fn-type:: fn) - (return "glgdGraphCallbackSet")) + :: glgdGraphCallbackSet) (define-cproc glgd-graph-flags-set (graph:: flag-mask:: flag-op::) - (return "glgdGraphFlagsSet")) + :: glgdGraphFlagsSet) (define-cproc glgd-graph-dim-set (graph:: w:: h::) - (return "glgdGraphDimSetByList")) + :: glgdGraphDimSetByList) (define-cproc glgd-graph-margin-set (graph:: margin::) - (return "glgdGraphMarginSet")) + :: glgdGraphMarginSet) (define-cproc glgd-graph-margin-get (graph::) - (return "glgdGraphMarginGet")) + :: glgdGraphMarginGet) (define-cproc glgd-graph-line-color-set (graph:: r:: g:: b:: a::) - (return "glgdGraphLineColorSetByList")) + :: glgdGraphLineColorSetByList) (define-cproc glgd-graph-attribute-clear (graph::) - (return "glgdGraphAttributeClear")) + :: glgdGraphAttributeClear) (define-cproc glgd-graph-attribute-set (graph:: attrNdx::) - (return "glgdGraphAttributeSet")) + :: glgdGraphAttributeSet) (define-cproc glgd-graph-attribute-toggle (graph:: attrNdx::) - (return "glgdGraphAttributeToggle")) + :: glgdGraphAttributeToggle) (define-cproc glgd-graph-attribute-reset (graph:: attrNdx::) - (return "glgdGraphAttributeReset")) + :: glgdGraphAttributeReset) (define-cproc glgd-graph-attribute-is-set (graph:: attrNdx::) - (return "glgdGraphAttributeIsSet")) + :: glgdGraphAttributeIsSet) -(define-cproc glgd-verbosity (level::) - (return "glgdVerbosity")) +(define-cproc glgd-verbosity (level::) :: glgdVerbosity) ;; Local variables: ;; mode: scheme --- gauche-gtk-0.4.1.orig/gtkgl/gtkgllib.stub 2010-03-18 12:21:39.000000000 +0900 +++ gauche-gtk-0.4.1/gtkgl/gtkgllib.stub 2010-03-18 12:35:54.000000000 +0900 @@ -24,7 +24,7 @@ ;; (define-cproc gtk-gl-ext-check-version (major:: minor:: micro::) - (return "GDKGLEXT_CHECK_VERSION")) + :: GDKGLEXT_CHECK_VERSION) ;;================================================================= ;; gdkglwidget.h @@ -35,30 +35,30 @@ share-list::-or-null direct:: render-type::) - (return "gtk_widget_set_gl_capability")) + :: gtk_widget_set_gl_capability) (define-cproc gtk-widget-is-gl-capable (widget::) - (return "gtk_widget_is_gl_capable")) + :: gtk_widget_is_gl_capable) (define-cproc gtk-widget-get-gl-config (widget::) - (return "gtk_widget_get_gl_config")) + :: gtk_widget_get_gl_config) (if "GTKGLEXT_CHECK_VERSION(0, 7, 0)" (define-cproc gtk-widget-create-gl-context (widget:: share-list::-or-null direct:: render-type::) - (return "gtk_widget_create_gl_context")) + :: gtk_widget_create_gl_context) ) (define-cproc gtk-widget-get-gl-context (widget::) - (return "gtk_widget_get_gl_context")) + :: gtk_widget_get_gl_context) (define-cproc gtk-widget-get-gl-window (widget::) - (return "gtk_widget_get_gl_window")) + :: gtk_widget_get_gl_window) (define-cproc gtk-widget-get-gl-drawable (widget::) - (return "gtk_widget_get_gl_drawable")) + :: gtk_widget_get_gl_drawable) ;; Local variables: ;; mode: scheme --- gauche-gtk-0.4.1.orig/gtkgl/gdkgllib.stub 2010-03-18 12:48:35.000000000 +0900 +++ gauche-gtk-0.4.1/gtkgl/gdkgllib.stub 2010-03-18 12:59:25.000000000 +0900 @@ -64,7 +64,7 @@ ; gdk-gl-config-new-for-screen - not until GdkScreen support (define-cproc gdk-gl-config-new-by-mode (mode::) - (return "gdk_gl_config_new_by_mode")) + :: gdk_gl_config_new_by_mode) ; gdk-gl-config-get-screen - not until GdkScreen support @@ -75,34 +75,34 @@ SCM_RETURN(Scm_Values2(SCM_MAKE_BOOL(r), Scm_MakeInteger(value)));") (define-cproc gdk-gl-config-get-colormap (glconfig::) - (return "gdk_gl_config_get_colormap")) + :: gdk_gl_config_get_colormap) (define-cproc gdk-gl-config-get-visual (glconfig::) - (return "gdk_gl_config_get_visual")) + :: gdk_gl_config_get_visual) (define-cproc gdk-gl-config-get-depth (glconfig::) - (return "gdk_gl_config_get_depth")) + :: gdk_gl_config_get_depth) (define-cproc gdk-gl-config-is-rgba (glconfig::) - (return "gdk_gl_config_is_rgba")) + :: gdk_gl_config_is_rgba) (define-cproc gdk-gl-config-is-double-buffered (glconfig::) - (return "gdk_gl_config_is_double_buffered")) + :: gdk_gl_config_is_double_buffered) (define-cproc gdk-gl-config-is-stereo (glconfig::) - (return "gdk_gl_config_is_stereo")) + :: gdk_gl_config_is_stereo) (define-cproc gdk-gl-config-has-alpha (glconfig::) - (return "gdk_gl_config_has_alpha")) + :: gdk_gl_config_has_alpha) (define-cproc gdk-gl-config-has-depth-buffer (glconfig::) - (return "gdk_gl_config_has_depth_buffer")) + :: gdk_gl_config_has_depth_buffer) (define-cproc gdk-gl-config-has-stencil-buffer (glconfig::) - (return "gdk_gl_config_has_stencil_buffer")) + :: gdk_gl_config_has_stencil_buffer) (define-cproc gdk-gl-config-has-accum-buffer (glconfig::) - (return "gdk_gl_config_has_accum_buffer")) + :: gdk_gl_config_has_accum_buffer) ;;================================================================= ;; gdkglcontext.h @@ -127,7 +127,7 @@ share-list::-or-null direct:: render-type::) - (return "gdk_gl_context_new")) + :: gdk_gl_context_new) ) (if "!GDKGLEXT_CHECK_VERSION(0, 7, 0)" (define-cproc gdk-gl-context-new (gldrawable:: @@ -135,29 +135,29 @@ share-list::-or-null direct:: render-type::) - (return "gdk_gl_context_new")) + :: gdk_gl_context_new) ) (define-cproc gdk-gl-context-copy! (dst:: src:: mask::) - (return "gdk_gl_context_copy")) + :: gdk_gl_context_copy) (define-cproc gdk-gl-context-get-gl-drawable (glcontext::) - (return "gdk_gl_context_get_gl_drawable")) + :: gdk_gl_context_get_gl_drawable) (define-cproc gdk-gl-context-get-gl-config (glcontext::) - (return "gdk_gl_context_get_gl_config")) + :: gdk_gl_context_get_gl_config) (define-cproc gdk-gl-context-is-direct (glcontext::) - (return "gdk_gl_context_is_direct")) + :: gdk_gl_context_is_direct) (define-cproc gdk-gl-context-get-render-type (glcontext::) - (return "gdk_gl_context_get_render_type")) + :: gdk_gl_context_get_render_type) (if "!GDKGLEXT_CHECK_VERSION(0, 7, 0)" (define-cproc gdk-gl-context-get-colormap (glcontext::) - (return "gdk_gl_context_get_colormap")) + :: gdk_gl_context_get_colormap) ) ;;================================================================= @@ -174,29 +174,29 @@ (define-cproc gdk-gl-drawable-make-current (gldrawable:: glcontext::) - (return "gdk_gl_drawable_make_current")) + :: gdk_gl_drawable_make_current) (define-cproc gdk-gl-drawable-is-double-buffered (gldrawable::) - (return "gdk_gl_drawable_is_double_buffered")) + :: gdk_gl_drawable_is_double_buffered) (define-cproc gdk-gl-drawable-swap-buffers (gldrawable::) - (return "gdk_gl_drawable_swap_buffers")) + :: gdk_gl_drawable_swap_buffers) (define-cproc gdk-gl-drawable-wait-gl (gldrawable::) - (return "gdk_gl_drawable_wait_gl")) + :: gdk_gl_drawable_wait_gl) (define-cproc gdk-gl-drawable-wait-gdk (gldrawable::) - (return "gdk_gl_drawable_wait_gdk")) + :: gdk_gl_drawable_wait_gdk) (define-cproc gdk-gl-drawable-gl-begin (gldrawable:: glcontext::) - (return "gdk_gl_drawable_gl_begin")) + :: gdk_gl_drawable_gl_begin) (define-cproc gdk-gl-drawable-gl-end (gldrawable::) - (return "gdk_gl_drawable_gl_end")) + :: gdk_gl_drawable_gl_end) (define-cproc gdk-gl-drawable-get-gl-config (gldrawable::) - (return "gdk_gl_drawable_get_gl_config")) + :: gdk_gl_drawable_get_gl_config) (define-cproc gdk-gl-drawable-get-size (gldrawable::) "gint w, h; @@ -211,7 +211,7 @@ first:: count:: list-base::) - (return "gdk_gl_font_use_pango_font")) + :: gdk_gl_font_use_pango_font) ;;================================================================= ;; gdkglpixmap.h @@ -233,7 +233,7 @@ SCM_RETURN(SCM_MAKE_GDK_GL_PIXMAP(gdk_gl_pixmap_new(glconfig, pixmap, alist)));") (define-cproc gdk-gl-pixmap-get-pixmap (glpixmap::) - (return "gdk_gl_pixmap_get_pixmap")) + :: gdk_gl_pixmap_get_pixmap) (define-cproc gdk-pixmap-set-gl-capability (pixmap:: glconfig:: @@ -242,23 +242,23 @@ SCM_RETURN(SCM_MAKE_GDK_GL_PIXMAP(gdk_pixmap_set_gl_capability(pixmap, glconfig,alist)));") (define-cproc gdk-pixmap-usnet-gl-capability (pixmap::) - (return "gdk_pixmap_unset_gl_capability")) + :: gdk_pixmap_unset_gl_capability) (define-cproc gdk-pixmap-is-gl-capable (pixmap::) - (return "gdk_pixmap_is_gl_capable")) + :: gdk_pixmap_is_gl_capable) (define-cproc gdk-pixmap_get_gl_pixmap (pixmap::) - (return "gdk_pixmap_get_gl_pixmap")) + :: gdk_pixmap_get_gl_pixmap) (define-cproc gdk-pixmap_get_gl_drawable (pixmap::) - (return "gdk_pixmap_get_gl_drawable")) + :: gdk_pixmap_get_gl_drawable) ;;================================================================= ;; gdkglquery.h ;; (define-cproc gdk-gl-query-extension () - (return "gdk_gl_query_extension")) + :: gdk_gl_query_extension) (define-cproc gdk-gl-query-version () "int major = 0, minor = 0; @@ -266,7 +266,7 @@ SCM_RETURN(Scm_Values3(SCM_MAKE_BOOL(r), SCM_MAKE_INT(major), SCM_MAKE_INT(minor)));") (define-cproc gdk-gl-query-gl-extension (extension::) - (return "gdk_gl_query_gl_extension")) + :: gdk_gl_query_gl_extension) ;;================================================================= ;; gdkgltokens.h @@ -403,7 +403,7 @@ ;; (define-cproc gdk-gl-ext-check-version (major:: minor:: micor::) - (return "GDKGLEXT_CHECK_VERSION")) + :: GDKGLEXT_CHECK_VERSION) ;;================================================================= ;; gdkglwindow.h @@ -425,7 +425,7 @@ SCM_RETURN(SCM_MAKE_GDK_GL_WINDOW(gdk_gl_window_new(glconfig, window, alist)));") (define-cproc gdk-gl-window-get-window (glwindow::) - (return "gdk_gl_window_get_window")) + :: gdk_gl_window_get_window) (define-cproc gdk-window-set-gl-capability (window:: glconfig:: @@ -434,16 +434,16 @@ SCM_RETURN(SCM_MAKE_GDK_GL_WINDOW(gdk_window_set_gl_capability(window, glconfig,alist)));") (define-cproc gdk-window-usnet-gl-capability (window::) - (return "gdk_window_unset_gl_capability")) + :: gdk_window_unset_gl_capability) (define-cproc gdk-window-is-gl-capable (window::) - (return "gdk_window_is_gl_capable")) + :: gdk_window_is_gl_capable) (define-cproc gdk-window-get-gl-window (window::) - (return "gdk_window_get_gl_window")) + :: gdk_window_get_gl_window) (define-cproc gdk-window-get-gl-drawable (window::) - (return "gdk_window_get_gl_drawable")) + :: gdk_window_get_gl_drawable) ;; Local variables: