From 0db2c191bfc3e6882275f7828b3ae66a6360b15d Mon Sep 17 00:00:00 2001 From: vurtun Date: Tue, 28 Apr 2015 15:01:50 +0200 Subject: [PATCH] removed test code + removed unused variables --- demo/xlib.c | 12 ++++-------- gui.c | 2 -- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/demo/xlib.c b/demo/xlib.c index ed770f9..057101e 100644 --- a/demo/xlib.c +++ b/demo/xlib.c @@ -476,10 +476,8 @@ main(int argc, char *argv[]) struct gui_canvas canvas; struct gui_command_buffer buffer; struct gui_command_list list; - struct gui_panel_stack stack; struct gui_panel_layout layout; - struct gui_window win; - struct gui_window msg; + struct gui_panel panel; /* Window */ UNUSED(argc); UNUSED(argv); @@ -514,12 +512,10 @@ main(int argc, char *argv[]) font.height = (gui_float)xfont->height; font.width = font_get_text_width; gui_default_config(&config); - gui_stack_clear(&stack); - gui_panel_init(&win.panel, 50, 50, 420, 300, + gui_panel_init(&panel, 50, 50, 420, 300, GUI_PANEL_BORDER|GUI_PANEL_MOVEABLE| GUI_PANEL_CLOSEABLE|GUI_PANEL_SCALEABLE| GUI_PANEL_MINIMIZABLE, &config, &font); - gui_stack_push(&stack, &win.panel); /* Demo */ memset(&demo, 0, sizeof(demo)); @@ -546,9 +542,9 @@ main(int argc, char *argv[]) /* GUI */ gui_buffer_begin(&canvas, &buffer, xw.width, xw.height); - running = gui_panel_begin_stacked(&layout, &win.panel, &stack, "Demo", &canvas, &in); + running = gui_panel_begin(&layout, &panel, "Demo", &canvas, &in); demo_panel(&layout, &demo); - gui_panel_end(&layout, &win.panel); + gui_panel_end(&layout, &panel); gui_buffer_end(&list, &buffer, &canvas, &status); /* Draw */ diff --git a/gui.c b/gui.c index a9b5510..c91e5dc 100644 --- a/gui.c +++ b/gui.c @@ -348,8 +348,6 @@ gui_do_button(const struct gui_canvas *canvas, gui_float x, gui_float y, gui_flo { gui_bool ret = gui_false; struct gui_color background; - struct gui_color highlight; - struct gui_rect inner; assert(button); if (!button)