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

(svn r11553) -Fix: make a few widget 'accessor' function const when they should be const.

release/0.6
rubidium 2007-12-02 12:10:48 +00:00
parent 4e574cab45
commit b20b2f4ec8
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/window.h
View File

@ -282,16 +282,16 @@ struct Window {
void SetWidgetDisabledState(byte widget_index, bool disab_stat); void SetWidgetDisabledState(byte widget_index, bool disab_stat);
void DisableWidget(byte widget_index); void DisableWidget(byte widget_index);
void EnableWidget(byte widget_index); void EnableWidget(byte widget_index);
bool IsWidgetDisabled(byte widget_index); bool IsWidgetDisabled(byte widget_index) const;
void SetWidgetHiddenState(byte widget_index, bool hidden_stat); void SetWidgetHiddenState(byte widget_index, bool hidden_stat);
void HideWidget(byte widget_index); void HideWidget(byte widget_index);
void ShowWidget(byte widget_index); void ShowWidget(byte widget_index);
bool IsWidgetHidden(byte widget_index); bool IsWidgetHidden(byte widget_index) const;
void SetWidgetLoweredState(byte widget_index, bool lowered_stat); void SetWidgetLoweredState(byte widget_index, bool lowered_stat);
void ToggleLoweredState(byte widget_index); void ToggleLoweredState(byte widget_index);
void LowerWidget(byte widget_index); void LowerWidget(byte widget_index);
void RaiseWidget(byte widget_index); void RaiseWidget(byte widget_index);
bool IsWidgetLowered(byte widget_index); bool IsWidgetLowered(byte widget_index) const;
void RaiseButtons(); void RaiseButtons();
void CDECL SetWidgetsDisabledState(bool disab_stat, int widgets, ...); void CDECL SetWidgetsDisabledState(bool disab_stat, int widgets, ...);
@ -865,14 +865,17 @@ inline void Window::DisableWidget(byte widget_index)
* Sets a widget to Enabled. * Sets a widget to Enabled.
* @param widget_index : index of this widget in the window * @param widget_index : index of this widget in the window
*/ */
inline void Window::EnableWidget(byte widget_index) { SetWidgetDisabledState(widget_index, false); } inline void Window::EnableWidget(byte widget_index)
{
SetWidgetDisabledState(widget_index, false);
}
/** /**
* Gets the enabled/disabled status of a widget. * Gets the enabled/disabled status of a widget.
* @param widget_index : index of this widget in the window * @param widget_index : index of this widget in the window
* @return status of the widget ie: disabled = true, enabled = false * @return status of the widget ie: disabled = true, enabled = false
*/ */
inline bool Window::IsWidgetDisabled(byte widget_index) inline bool Window::IsWidgetDisabled(byte widget_index) const
{ {
assert(widget_index < this->widget_count); assert(widget_index < this->widget_count);
return HasBit(this->widget[widget_index].display_flags, WIDG_DISABLED); return HasBit(this->widget[widget_index].display_flags, WIDG_DISABLED);
@ -914,7 +917,7 @@ inline void Window::ShowWidget(byte widget_index)
* @param widget_index : index of this widget in the window * @param widget_index : index of this widget in the window
* @return status of the widget ie: hidden = true, visible = false * @return status of the widget ie: hidden = true, visible = false
*/ */
inline bool Window::IsWidgetHidden(byte widget_index) inline bool Window::IsWidgetHidden(byte widget_index) const
{ {
assert(widget_index < this->widget_count); assert(widget_index < this->widget_count);
return HasBit(this->widget[widget_index].display_flags, WIDG_HIDDEN); return HasBit(this->widget[widget_index].display_flags, WIDG_HIDDEN);
@ -964,7 +967,7 @@ inline void Window::RaiseWidget(byte widget_index)
* @param widget_index : index of this widget in the window * @param widget_index : index of this widget in the window
* @return status of the widget ie: lowered = true, raised= false * @return status of the widget ie: lowered = true, raised= false
*/ */
inline bool Window::IsWidgetLowered(byte widget_index) inline bool Window::IsWidgetLowered(byte widget_index) const
{ {
assert(widget_index < this->widget_count); assert(widget_index < this->widget_count);
return HasBit(this->widget[widget_index].display_flags, WIDG_LOWERED); return HasBit(this->widget[widget_index].display_flags, WIDG_LOWERED);