From a14d80f83aebe75241bf63b4f3ffca3a5d952577 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Mon, 6 Oct 2008 18:22:32 +0000 Subject: libui updates, support menu .ini files --- src/ui/window.cc | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/ui/window.cc') diff --git a/src/ui/window.cc b/src/ui/window.cc index 8763b53..60fbf56 100644 --- a/src/ui/window.cc +++ b/src/ui/window.cc @@ -21,9 +21,6 @@ Window::Window(Window *parent) : Widget(static_cast(parent)) Window::~Window() { - if (parent()) { - static_cast(parent())->remove_window(this); - } window_children.clear(); } @@ -34,8 +31,7 @@ void Window::draw_border() if (palette()) render::gl::color(palette()->foreground()); - math::Vector2f v(to_global(location())); - render::primitives::border(v, size()); + render::primitives::border(global_location(), size()); } Window::Windows::iterator Window::find_window(Window *window) @@ -59,10 +55,11 @@ void Window::add_window(Window *window) void Window::remove_window(Window *window) { - Windows::iterator it = find_window(window); if (it != window_children.end()) { + remove_child(*it); window_children.erase(it); } } + } -- cgit v1.2.3