mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r16465) -Codechange: Eliminated GetGloballyFocusedWidget(), it was used only once.

release/1.0
alberth 2009-05-30 11:30:25 +00:00
parent 2a2a9a27ba
commit bfb8df3fb9
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/window.cpp
View File

@ -111,15 +111,6 @@ void SetFocusedWindow(Window *w)
if (_focused_window != NULL) _focused_window->OnFocus(); if (_focused_window != NULL) _focused_window->OnFocus();
} }
/**
* Gets the globally focused widget. Which is the focused widget of the focused window.
* @return A pointer to the globally focused Widget, or NULL if there is no globally focused widget.
*/
const Widget *GetGloballyFocusedWidget()
{
return _focused_window != NULL ? _focused_window->focused_widget : NULL;
}
/** /**
* Check if an edit box is in global focus. That is if focused window * Check if an edit box is in global focus. That is if focused window
* has a edit box as focused widget, or if a console is focused. * has a edit box as focused widget, or if a console is focused.
@ -127,7 +118,7 @@ const Widget *GetGloballyFocusedWidget()
*/ */
bool EditBoxInGlobalFocus() bool EditBoxInGlobalFocus()
{ {
const Widget *wi = GetGloballyFocusedWidget(); const Widget *wi = (_focused_window != NULL) ? _focused_window->focused_widget : NULL;
/* The console does not have an edit box so a special case is needed. */ /* The console does not have an edit box so a special case is needed. */
return (wi != NULL && wi->type == WWT_EDITBOX) || return (wi != NULL && wi->type == WWT_EDITBOX) ||

1
src/window_gui.h
View File

@ -657,7 +657,6 @@ enum SpecialMouseMode {
Window *GetCallbackWnd(); Window *GetCallbackWnd();
void SetFocusedWindow(Window *w); void SetFocusedWindow(Window *w);
const Widget *GetGloballyFocusedWidget();
bool EditBoxInGlobalFocus(); bool EditBoxInGlobalFocus();
void ScrollbarClickHandler(Window *w, const Widget *wi, int x, int y); void ScrollbarClickHandler(Window *w, const Widget *wi, int x, int y);