From f9733ac590e2be09045ece94ff7fc68be61fdacd Mon Sep 17 00:00:00 2001 From: alberth Date: Sun, 11 Oct 2009 08:07:09 +0000 Subject: (svn r17759) -Codechange [FS#3257]: Return focus to the parent window using the function designed for it. --- src/osk_gui.cpp | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'src') diff --git a/src/osk_gui.cpp b/src/osk_gui.cpp index cb4386ee6..b87bbf79a 100644 --- a/src/osk_gui.cpp +++ b/src/osk_gui.cpp @@ -162,22 +162,11 @@ struct OskWindow : public Window { } switch (widget) { - case OSK_WIDGET_TEXT: { - /* Find the edit box of the parent window and give focus to that */ - if (this->parent->widget != NULL) { - const Widget *wi = this->parent->GetWidgetOfType(WWT_EDITBOX); - if (wi != NULL) this->parent->focused_widget = wi; - } - if (this->parent->nested_root != NULL) { - const NWidgetCore *nwid = dynamic_cast(this->parent->nested_root->GetWidgetOfType(WWT_EDITBOX)); - if (nwid != NULL) this->parent->nested_focus = nwid; - } - - /* Give focus to parent window */ + case OSK_WIDGET_TEXT: + /* Return focus to the parent widget and window. */ + this->parent->SetFocusedWidget(this->text_btn); SetFocusedWindow(this->parent); - break; - } case OSK_WIDGET_BACKSPACE: if (DeleteTextBufferChar(&this->qs->text, WKC_BACKSPACE)) this->InvalidateParent(); -- cgit v1.2.3-54-g00ecf