summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/widget.cpp27
-rw-r--r--src/widget_type.h50
2 files changed, 0 insertions, 77 deletions
diff --git a/src/widget.cpp b/src/widget.cpp
index 77f2da21a..b4c0c9819 100644
--- a/src/widget.cpp
+++ b/src/widget.cpp
@@ -2458,15 +2458,6 @@ static int MakeNWidget(const NWidgetPart *parts, int count, NWidgetBase **dest,
break;
}
- case WPT_RESIZE_PTR: {
- NWidgetResizeBase *nwrb = dynamic_cast<NWidgetResizeBase *>(*dest);
- if (nwrb != NULL) {
- assert(parts->u.xy_ptr->x >= 0 && parts->u.xy_ptr->y >= 0);
- nwrb->SetResize(parts->u.xy_ptr->x, parts->u.xy_ptr->y);
- }
- break;
- }
-
case WPT_MINSIZE: {
NWidgetResizeBase *nwrb = dynamic_cast<NWidgetResizeBase *>(*dest);
if (nwrb != NULL) {
@@ -2476,15 +2467,6 @@ static int MakeNWidget(const NWidgetPart *parts, int count, NWidgetBase **dest,
break;
}
- case WPT_MINSIZE_PTR: {
- NWidgetResizeBase *nwrb = dynamic_cast<NWidgetResizeBase *>(*dest);
- if (nwrb != NULL) {
- assert(parts->u.xy_ptr->x >= 0 && parts->u.xy_ptr->y >= 0);
- nwrb->SetMinimalSize((uint)(parts->u.xy_ptr->x), (uint)(parts->u.xy_ptr->y));
- }
- break;
- }
-
case WPT_FILL: {
NWidgetResizeBase *nwrb = dynamic_cast<NWidgetResizeBase *>(*dest);
if (nwrb != NULL) nwrb->SetFill(parts->u.xy.x != 0, parts->u.xy.y != 0);
@@ -2500,15 +2482,6 @@ static int MakeNWidget(const NWidgetPart *parts, int count, NWidgetBase **dest,
break;
}
- case WPT_DATATIP_PTR: {
- NWidgetCore *nwc = dynamic_cast<NWidgetCore *>(*dest);
- if (nwc != NULL) {
- nwc->widget_data = parts->u.datatip_ptr->data;
- nwc->tool_tip = parts->u.datatip_ptr->tooltip;
- }
- break;
- }
-
case WPT_PADDING:
if (*dest != NULL) (*dest)->SetPadding(parts->u.padding.top, parts->u.padding.right, parts->u.padding.bottom, parts->u.padding.left);
break;
diff --git a/src/widget_type.h b/src/widget_type.h
index 8c07b0b43..b00f71803 100644
--- a/src/widget_type.h
+++ b/src/widget_type.h
@@ -124,12 +124,9 @@ enum WidgetType {
/* Nested widget part types. */
WPT_RESIZE, ///< Widget part for specifying resizing.
- WPT_RESIZE_PTR, ///< Widget part for specifying resizing via a pointer.
WPT_MINSIZE, ///< Widget part for specifying minimal size.
- WPT_MINSIZE_PTR, ///< Widget part for specifying minimal size via a pointer.
WPT_FILL, ///< Widget part for specifying fill.
WPT_DATATIP, ///< Widget part for specifying data and tooltip.
- WPT_DATATIP_PTR, ///< Widget part for specifying data and tooltip via a pointer.
WPT_PADDING, ///< Widget part for specifying a padding.
WPT_PIPSPACE, ///< Widget part for specifying pre/inter/post space for containers.
WPT_ENDCONTAINER, ///< Widget part to denote end of a container.
@@ -618,9 +615,7 @@ struct NWidgetPart {
WidgetType type; ///< Type of the part. @see NWidgetPartType.
union {
Point xy; ///< Part with an x/y size.
- Point *xy_ptr; ///< Part with a pointer to an x/y size.
NWidgetPartDataTip data_tip; ///< Part with a data/tooltip.
- NWidgetPartDataTip *datatip_ptr; ///< Part with a pointer to data/tooltip.
NWidgetPartWidget widget; ///< Part with a start of a widget.
NWidgetPartPaddings padding; ///< Part with paddings.
NWidgetPartPIP pip; ///< Part with pre/inter/post spaces.
@@ -647,21 +642,6 @@ static inline NWidgetPart SetResize(int16 dx, int16 dy)
}
/**
- * Widget part function for using a pointer to set the resize step.
- * @param ptr Pointer to horizontal and vertical resize step.
- * @ingroup NestedWidgetParts
- */
-static inline NWidgetPart SetResize(Point *ptr)
-{
- NWidgetPart part;
-
- part.type = WPT_RESIZE_PTR;
- part.u.xy_ptr = ptr;
-
- return part;
-}
-
-/**
* Widget part function for setting the minimal size.
* @param dx Horizontal minimal size.
* @param dy Vertical minimal size.
@@ -679,21 +659,6 @@ static inline NWidgetPart SetMinimalSize(int16 x, int16 y)
}
/**
- * Widget part function for using a pointer to set the minimal size.
- * @param ptr Pointer to horizontal and vertical minimal size.
- * @ingroup NestedWidgetParts
- */
-static inline NWidgetPart SetMinimalSize(Point *ptr)
-{
- NWidgetPart part;
-
- part.type = WPT_MINSIZE_PTR;
- part.u.xy_ptr = ptr;
-
- return part;
-}
-
-/**
* Widget part function for setting filling.
* @param x_fill Allow horizontal filling from minimal size.
* @param y_fill Allow vertical filling from minimal size.
@@ -741,21 +706,6 @@ static inline NWidgetPart SetDataTip(uint16 data, StringID tip)
}
/**
- * Widget part function for setting the data and tooltip via a pointer.
- * @param ptr Pointer to the data and tooltip of the widget.
- * @ingroup NestedWidgetParts
- */
-static inline NWidgetPart SetDataTip(NWidgetPartDataTip *ptr)
-{
- NWidgetPart part;
-
- part.type = WPT_DATATIP_PTR;
- part.u.datatip_ptr = ptr;
-
- return part;
-}
-
-/**
* Widget part function for setting additional space around a widget.
* Parameters start above the widget, and are specified in clock-wise direction.
* @param top The padding above the widget.