From a6a701470cba25198ca1c0fdd04c10c86a573b1d Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Mon, 16 Apr 2012 03:37:52 +0000 Subject: quote font name in Tk -font triplets since font names can contain spaces svn path=/trunk/externals/flatgui/; revision=16125 --- entry.c | 4 ++-- knob.c | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/entry.c b/entry.c index 430b32d..2a466f9 100644 --- a/entry.c +++ b/entry.c @@ -263,7 +263,7 @@ static void create_widget(t_entry *x) /* Seems we have to delete the widget in case it already exists (Provided by Guenter)*/ sys_vgui("destroy %s\n", x->frame_id); sys_vgui("frame %s \n", x->frame_id); - sys_vgui("text %s -font {%s %d %s} -border 1 \ + sys_vgui("text %s -font {{%s} %d %s} -border 1 \ -highlightthickness 1 -relief sunken -bg \"%s\" -fg \"%s\" \ -yscrollcommand {%s set} \n", x->text_id, @@ -639,7 +639,7 @@ static void entry_fontsize(t_entry *x, t_float font_size) if(font_size > 8) { x->x_font_size = (t_int)font_size; - sys_vgui("%s configure -font {%s %d %s} \n", + sys_vgui("%s configure -font {{%s} %d %s} \n", x->text_id, x->x_font_face->s_name, x->x_font_size, x->x_font_weight->s_name); diff --git a/knob.c b/knob.c index 04b2269..fdd8a93 100644 --- a/knob.c +++ b/knob.c @@ -133,7 +133,7 @@ static void knob_draw_new(t_knob *x, t_glist *glist) x); sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \ - -font {%s %d bold} -fill #%6.6x -tags %xLABEL\n", + -font {{%s} %d bold} -fill #%6.6x -tags %xLABEL\n", canvas, xpos+x->x_gui.x_ldx, ypos+x->x_gui.x_ldy, strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"", x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_lcol, x); @@ -220,7 +220,7 @@ static void knob_draw_config(t_knob* x,t_glist* glist) { t_canvas *canvas=glist_getcanvas(glist); - sys_vgui(".x%lx.c itemconfigure %xLABEL -font {%s %d bold} -fill #%6.6x -text {%s} \n", + sys_vgui(".x%lx.c itemconfigure %xLABEL -font {{%s} %d bold} -fill #%6.6x -text {%s} \n", canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_lcol, strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:""); @@ -279,19 +279,19 @@ static void knob_draw_select(t_knob *x, t_glist *glist) void knob_draw(t_knob *x, t_glist *glist, int mode) { if(mode == IEM_GUI_DRAW_MODE_UPDATE) - knob_draw_update(x, glist); + knob_draw_update(x, glist); else if(mode == IEM_GUI_DRAW_MODE_MOVE) - knob_draw_move(x, glist); + knob_draw_move(x, glist); else if(mode == IEM_GUI_DRAW_MODE_NEW) - knob_draw_new(x, glist); + knob_draw_new(x, glist); else if(mode == IEM_GUI_DRAW_MODE_SELECT) - knob_draw_select(x, glist); + knob_draw_select(x, glist); else if(mode == IEM_GUI_DRAW_MODE_ERASE) - knob_draw_erase(x, glist); + knob_draw_erase(x, glist); else if(mode == IEM_GUI_DRAW_MODE_CONFIG) - knob_draw_config(x, glist); + knob_draw_config(x, glist); else if(mode >= IEM_GUI_DRAW_MODE_IO) - knob_draw_io(x, glist, mode - IEM_GUI_DRAW_MODE_IO); + knob_draw_io(x, glist, mode - IEM_GUI_DRAW_MODE_IO); } /* ------------------------ knob widgetbehaviour----------------------------- */ -- cgit v1.2.1