dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r17903) -Codechange: don't get a modifiable NWidget from a const Window

Browse Source
This commit is contained in:
rubidium
2009-10-30 07:51:33 +00:00
parent 87ea1f1dcd
commit 3bc0a4ed3e
3 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/window_gui.h
View File

@@ -389,7 +389,9 @@ public:
Window *z_back; ///< The window behind us in z-order.
template <class NWID>
inline NWID *GetWidget(uint widnum) const;
inline const NWID *GetWidget(uint widnum) const;
template <class NWID>
inline NWID *GetWidget(uint widnum);
void InitNested(const WindowDesc *desc, WindowNumber number = 0);
@@ -847,7 +849,7 @@ public:
* @return The requested widget if it is instantiated, \c NULL otherwise.
*/
template <class NWID>
inline NWID *Window::GetWidget(uint widnum) const
inline NWID *Window::GetWidget(uint widnum)
{
if (widnum >= this->nested_array_size || this->nested_array[widnum] == NULL) return NULL;
NWID *nwid = dynamic_cast<NWID *>(this->nested_array[widnum]);
@@ -857,12 +859,23 @@ inline NWID *Window::GetWidget(uint widnum) const
/** Specialized case of #Window::GetWidget for the nested widget base class. */
template <>
inline NWidgetBase *Window::GetWidget<NWidgetBase>(uint widnum) const
inline const NWidgetBase *Window::GetWidget<NWidgetBase>(uint widnum) const
{
if (widnum >= this->nested_array_size) return NULL;
return this->nested_array[widnum];
}
/** Get the nested widget with number \a widnum from the nested widget tree.
* @tparam NWID Type of the nested widget.
* @param widnum Widget number of the widget to retrieve.
* @return The requested widget if it is instantiated, \c NULL otherwise.
*/
template <class NWID>
inline const NWID *Window::GetWidget(uint widnum) const
{
return const_cast<Window *>(this)->GetWidget<NWID>(widnum);
}
/**
* Base class for windows opened from a toolbar.