diff options
| -rw-r--r-- | src/widget.cpp | 29 | ||||
| -rw-r--r-- | src/widget_type.h | 5 |
2 files changed, 0 insertions, 34 deletions
diff --git a/src/widget.cpp b/src/widget.cpp index 089613fab..f6e858cde 100644 --- a/src/widget.cpp +++ b/src/widget.cpp @@ -918,13 +918,6 @@ NWidgetBase::NWidgetBase(WidgetType tp) : ZeroedMemoryAllocator() */ /** - * @fn void FillNestedArray(NWidgetCore **array, uint length) - * Fill the Window::nested_array array with pointers to nested widgets in the tree. - * @param array Base pointer of the array. - * @param length Length of the array. - */ - -/** * Store size and position. * @param sizing Type of resizing to perform. * @param x Horizontal offset of the widget relative to the left edge of the window. @@ -1082,11 +1075,6 @@ void NWidgetCore::SetDataTip(uint16 widget_data, StringID tool_tip) this->tool_tip = tool_tip; } -void NWidgetCore::FillNestedArray(NWidgetCore **array, uint length) -{ - if (this->index >= 0 && (uint)(this->index) < length) array[this->index] = this; -} - void NWidgetCore::StoreWidgets(Widget *widgets, int length, bool left_moving, bool top_moving, bool rtl) { if (this->index < 0) return; @@ -1184,13 +1172,6 @@ void NWidgetContainer::Add(NWidgetBase *wid) } } -void NWidgetContainer::FillNestedArray(NWidgetCore **array, uint length) -{ - for (NWidgetBase *child_wid = this->head; child_wid != NULL; child_wid = child_wid->next) { - child_wid->FillNestedArray(array, length); - } -} - /** * Return the biggest possible size of a nested widget. * @param base Base size of the widget. @@ -1614,10 +1595,6 @@ void NWidgetSpacer::SetupSmallestSize(Window *w, bool init_array) this->smallest_y = this->min_y; } -void NWidgetSpacer::FillNestedArray(NWidgetCore **array, uint length) -{ -} - void NWidgetSpacer::StoreWidgets(Widget *widgets, int length, bool left_moving, bool top_moving, bool rtl) { /* Spacer widgets are never stored in the widget array. */ @@ -1742,12 +1719,6 @@ void NWidgetBackground::StoreWidgets(Widget *widgets, int length, bool left_movi if (this->child != NULL) this->child->StoreWidgets(widgets, length, left_moving, top_moving, rtl); } -void NWidgetBackground::FillNestedArray(NWidgetCore **array, uint length) -{ - if (this->index >= 0 && (uint)(this->index) < length) array[this->index] = this; - if (this->child != NULL) this->child->FillNestedArray(array, length); -} - void NWidgetBackground::Draw(const Window *w) { if (this->current_x == 0 || this->current_y == 0) return; diff --git a/src/widget_type.h b/src/widget_type.h index c63beae73..beef4421d 100644 --- a/src/widget_type.h +++ b/src/widget_type.h @@ -169,7 +169,6 @@ public: virtual void AssignSizePosition(SizingType sizing, uint x, uint y, uint given_width, uint given_height, bool allow_resize_x, bool allow_resize_y, bool rtl) = 0; virtual void StoreWidgets(Widget *widgets, int length, bool left_moving, bool top_moving, bool rtl) = 0; - virtual void FillNestedArray(NWidgetCore **array, uint length) = 0; virtual NWidgetCore *GetWidgetFromPos(int x, int y) = 0; virtual NWidgetBase *GetWidgetOfType(WidgetType tp) = 0; @@ -285,7 +284,6 @@ public: inline bool IsDisabled(); void StoreWidgets(Widget *widgets, int length, bool left_moving, bool top_moving, bool rtl); - /* virtual */ void FillNestedArray(NWidgetCore **array, uint length); virtual Scrollbar *FindScrollbar(Window *w, bool allow_next = true) = 0; @@ -335,7 +333,6 @@ public: ~NWidgetContainer(); void Add(NWidgetBase *wid); - /* virtual */ void FillNestedArray(NWidgetCore **array, uint length); /** Return whether the container is empty. */ inline bool IsEmpty() { return head == NULL; }; @@ -432,7 +429,6 @@ public: void SetupSmallestSize(Window *w, bool init_array); void StoreWidgets(Widget *widgets, int length, bool left_moving, bool top_moving, bool rtl); - /* virtual */ void FillNestedArray(NWidgetCore **array, uint length); /* virtual */ void Draw(const Window *w); /* virtual */ void Invalidate(const Window *w) const; @@ -454,7 +450,6 @@ public: void AssignSizePosition(SizingType sizing, uint x, uint y, uint given_width, uint given_height, bool allow_resize_x, bool allow_resize_y, bool rtl); void StoreWidgets(Widget *widgets, int length, bool left_moving, bool top_moving, bool rtl); - /* virtual */ void FillNestedArray(NWidgetCore **array, uint length); /* virtual */ void Draw(const Window *w); /* virtual */ NWidgetCore *GetWidgetFromPos(int x, int y); |