From 0c005f9cfaf99d5c35a1a0a6b3a503fd740e7841 Mon Sep 17 00:00:00 2001 From: rubidium Date: Fri, 6 Nov 2009 20:26:28 +0000 Subject: (svn r17984) -Codechange: make it possible to use MakeNWidgets using a custom container widget. --- src/widget.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/widget.cpp') diff --git a/src/widget.cpp b/src/widget.cpp index befc94da3..0f9232ac6 100644 --- a/src/widget.cpp +++ b/src/widget.cpp @@ -2680,17 +2680,18 @@ static int MakeWidgetTree(const NWidgetPart *parts, int count, NWidgetBase *pare * @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; } /** -- cgit v1.2.3-54-g00ecf