Merge 8badf407fe into fea45b2d5b

darwin/grid.m

@@ -599,6 +599,35 @@ struct uiGrid {
 	[self append:gc];
 }
 
+- (void)delete:(int)n
+{
+	gridChild *gc;
+	BOOL update;
+	int oldnh, oldnv;
+
+	gc = (gridChild *) [self->children objectAtIndex:n];
+
+	uiControlSetParent(gc.c, NULL);
+	uiDarwinControlSetSuperview(uiDarwinControl(gc.c), nil);
+
+	uiDarwinControlSetHuggingPriority(uiDarwinControl(gc.c), gc.oldHorzHuggingPri, NSLayoutConstraintOrientationHorizontal);
+	uiDarwinControlSetHuggingPriority(uiDarwinControl(gc.c), gc.oldVertHuggingPri, NSLayoutConstraintOrientationVertical);
+
+	oldnh = [self nhexpand];
+	oldnv = [self nvexpand];
+	[self->children removeObjectAtIndex:n];
+
+	update = NO;
+	if (gc.hexpand)
+		if (oldnh == 0)
+			update = YES;
+	if (gc.vexpand)
+		if (oldnv == 0)
+			update = YES;
+	if (update)
+		uiDarwinNotifyEdgeHuggingChanged(uiDarwinControl(self->g));
+}
+
 - (int)isPadded
 {
 	return self->padded;

ui.h

@@ -1123,6 +1123,7 @@ typedef struct uiGrid uiGrid;
 #define uiGrid(this) ((uiGrid *) (this))
 _UI_EXTERN void uiGridAppend(uiGrid *g, uiControl *c, int left, int top, int xspan, int yspan, int hexpand, uiAlign halign, int vexpand, uiAlign valign);
 _UI_EXTERN void uiGridInsertAt(uiGrid *g, uiControl *c, uiControl *existing, uiAt at, int xspan, int yspan, int hexpand, uiAlign halign, int vexpand, uiAlign valign);
+_UI_EXTERN void uiGridDelete(uiGrid *g, int index);
 _UI_EXTERN int uiGridPadded(uiGrid *g);
 _UI_EXTERN void uiGridSetPadded(uiGrid *g, int padded);
 _UI_EXTERN uiGrid *uiNewGrid(void);

unix/grid.c

@@ -108,6 +108,25 @@ void uiGridInsertAt(uiGrid *g, uiControl *c, uiControl *existing, uiAt at, int x
 	g_array_append_val(g->children, gc);
 }
 
+void uiGridDelete(uiGrid *g, int index)
+{
+	struct gridChild *gc;
+	GtkWidget *widget;
+
+	gc = ctrl(g, index);
+	widget = GTK_WIDGET(uiControlHandle(gc->c));
+
+	uiControlSetParent(gc->c, NULL);
+	uiUnixControlSetContainer(uiUnixControl(gc->c), g->container, TRUE);
+
+	gtk_widget_set_hexpand(widget, gc->oldhexpand);
+	gtk_widget_set_halign(widget, gc->oldhalign);
+	gtk_widget_set_vexpand(widget, gc->oldvexpand);
+	gtk_widget_set_valign(widget, gc->oldvalign);
+
+	g_array_remove_index(g->children, index);
+}
+
 int uiGridPadded(uiGrid *g)
 {
 	return g->padded;

windows/grid.cpp

@@ -627,6 +627,19 @@ void uiGridInsertAt(uiGrid *g, uiControl *c, uiControl *existing, uiAt at, int x
 	add(g, gc);
 }
 
+void uiGridDelete(uiGrid *g, int index)
+{
+	uiControl *c;
+
+	c = (*(g->children))[index]->c;
+	uiControlSetParent(c, NULL);
+	uiWindowsControlSetParentHWND(uiWindowsControl(c), NULL);
+	g->children->erase(g->children->begin() + index);
+	gridRecomputeMinMax(g);
+	gridArrangeChildren(g);
+	uiWindowsControlMinimumSizeChanged(uiWindowsControl(g));
+}
+
 int uiGridPadded(uiGrid *g)
 {
 	return g->padded;