From ff4298c30dfd8e4cee237b40acec599020d14ff1 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Thu, 22 Nov 2007 00:37:59 +0000 Subject: - moved iolet drawing/erasing to tkwidgets common - added iolets roughly to [checkbutton] - cleaned up naming in text.c a bit - moved t_widgetbehavior setup to textwidget_setup() svn path=/trunk/externals/tkwidgets/; revision=9021 --- shared/tkwidgets.h | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'shared/tkwidgets.h') diff --git a/shared/tkwidgets.h b/shared/tkwidgets.h index aa1d097..9f0dea4 100644 --- a/shared/tkwidgets.h +++ b/shared/tkwidgets.h @@ -48,7 +48,7 @@ typedef struct _tkwidgets t_symbol* tcl_namespace; /* namespace to prevent name collisions */ t_symbol* canvas_id; /* the canvas that is showing this widget */ t_symbol* frame_id; /* the frame around the widget and supporters */ - t_symbol* window_id; /* the window that contains the widget */ + t_symbol* window_tag; /* the window that contains the widget */ t_symbol* widget_id; /* the core widget */ t_symbol* handle_id; /* the resizing handle */ t_symbol* all_tag; /* the tag for moving/deleting everything */ @@ -73,14 +73,20 @@ t_symbol* tkwidgets_gen_callback_name(t_symbol* tcl_namespace); t_symbol* tkwidgets_gen_canvas_id(t_canvas* canvas); t_symbol* tkwidgets_gen_frame_id(t_object* x, t_symbol* canvas_id); t_symbol* tkwidgets_gen_widget_id(t_object* x, t_symbol* parent_id); -t_symbol* tkwidgets_gen_handle_id(t_object *x, t_symbol* parent_id); -t_symbol* tkwidgets_gen_window_tag(t_object* x, t_symbol* parent_id); +t_symbol* tkwidgets_gen_handle_id(t_object *x, t_symbol* canvas_id); +t_symbol* tkwidgets_gen_scrollbar_id(t_object *x, t_symbol* frame_id); +t_symbol* tkwidgets_gen_window_tag(t_object* x, t_symbol* canvas_id); +t_symbol* tkwidgets_gen_iolets_tag(t_object* x); t_symbol* tkwidgets_gen_all_tag(t_object *x); // TODO perhaps I should try to use glist_drawiofor() from g_text.c -void tkwidgets_draw_inlets(t_object *x, t_glist *glist, - int total_inlets, int total_outlets); +void tkwidgets_draw_inlets(t_object *x, t_glist *glist, t_symbol *canvas_id, + t_symbol *iolets_tag, t_symbol *all_tag, + int width, int height, + int total_inlets, int total_outlets); +void tkwidgets_erase_inlets(t_symbol* canvas_id, t_symbol* iolets_tag); + void tkwidgets_draw_handle(); // TODO draw resize handle when selected in editmode void tkwidgets_draw_resize_window(); // TODO draw the resize window while resizing -- cgit v1.2.1