cpp/openttd-patchpack/source Changeset - r13459:e43f85d5cd0c

Changeset - r13459:e43f85d5cd0c

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

rubidium - 15 years ago 2009-11-06 20:26:28
rubidium@openttd.org

(svn r17984) -Codechange: make it possible to use MakeNWidgets using a custom container widget.

2 files changed with 8 insertions and 7 deletions:

src/widget.cpp

src/widget_type.h

0 comments (0 inline, 0 general)

src/widget.cpp

➞

Show inline comments

@@ @@ -2680,17 +2680,18 @@ static int MakeWidgetTree(const NWidgetP @@
  * @param parts Array with parts of the widgets.
  * @param count Length of the \a parts array.
  * @param biggest_index Pointer to biggest nested widget index collected in the tree.
  * @param container Container to add the nested widgets to. In case it is NULL a vertical container is used.
  * @return Root of the nested widget tree, a vertical container containing the entire GUI.
  * @ingroup NestedWidgetParts
  * @precond \c biggest_index != NULL
  * @postcond \c *biggest_index contains the largest widget index of the tree and \c -1 if no index is used.
  * @pre \c biggest_index != NULL
  * @post \c *biggest_index contains the largest widget index of the tree and \c -1 if no index is used.
  */
 NWidgetContainer *MakeNWidgets(const NWidgetPart *parts, int count, int *biggest_index)
+NWidgetContainer *MakeNWidgets(const NWidgetPart *parts, int count, int *biggest_index, NWidgetContainer *container)
+{
 	*biggest_index = -1;
 	NWidgetContainer *cont = new NWidgetVertical();
 	MakeWidgetTree(parts, count, cont, biggest_index);
 	return cont;
 	if (container == NULL) container = new NWidgetVertical();
 	MakeWidgetTree(parts, count, container, biggest_index);
 	return container;
+}
 /**

src/widget_type.h

➞

Show inline comments

@@ @@ -829,7 +829,7 @@ static inline NWidgetPart NWidgetFunctio @@
 	return part;
+}
 NWidgetContainer *MakeNWidgets(const NWidgetPart *parts, int count, int *biggest_index);
+NWidgetContainer *MakeNWidgets(const NWidgetPart *parts, int count, int *biggest_index, NWidgetContainer *container = NULL);
 const Widget *InitializeWidgetArrayFromNestedWidgets(const NWidgetPart *parts, int parts_length, const Widget *orig_wid, Widget **wid_cache);

0 comments (0 inline, 0 general)