Tue, 24 Jan 2017 18:46:47 +0100
fixes a ucx include
/* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * * Copyright 2015 Olaf Wintermann. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ #include <stdio.h> #include <stdlib.h> #include "container.h" #include "../common/object.h" UIWIDGET ui_vbox(UiObject *obj) { return ui_vbox_sp(obj, 0, 0); } UIWIDGET ui_hbox(UiObject *obj) { return ui_hbox_sp(obj, 0, 0); } UIWIDGET ui_vbox_sp(UiObject *obj, int margin, int spacing) { UiContainer *ct = uic_get_current_container(obj); UIWIDGET vbox = UIvbox(ct, margin, spacing); UiObject *newobj = uic_object_new(obj, vbox); newobj->container = (UiContainer*)vbox; uic_obj_add(obj, newobj); return vbox; } UIWIDGET ui_hbox_sp(UiObject *obj, int margin, int spacing) { UiContainer *ct = uic_get_current_container(obj); UIWIDGET hbox = UIhbox(ct, margin, spacing); UiObject *newobj = uic_object_new(obj, hbox); newobj->container = (UiContainer*)hbox; uic_obj_add(obj, newobj); return hbox; } UIWIDGET ui_grid(UiObject *obj) { return ui_grid_sp(obj, 0, 0, 0); } UIWIDGET ui_grid_sp(UiObject *obj, int margin, int columnspacing, int rowspacing) { UiContainer *ct = uic_get_current_container(obj); UIWIDGET grid = UIgrid(ct, margin, columnspacing, rowspacing); UiObject *newobj = uic_object_new(obj, grid); newobj->container = (UiContainer*)grid; uic_obj_add(obj, newobj); return grid; } UIWIDGET ui_scrolledwindow(UiObject *obj) { UiContainer *ct = uic_get_current_container(obj); UIWIDGET scrolledwindow = UIscrolledwindow(ct); UiObject *newobj = uic_object_new(obj, scrolledwindow); newobj->container = (UiContainer*)scrolledwindow; uic_obj_add(obj, newobj); return scrolledwindow; } /* * TODO: sidebar */ UIWIDGET ui_tabview(UiObject *obj) { UiContainer *ct = uic_get_current_container(obj); UIWIDGET tabview = UItabview(ct); UiObject *newobj = uic_object_new(obj, tabview); newobj->container = (UiContainer*)tabview; uic_obj_add(obj, newobj); return tabview; } void ui_tab(UiObject *obj, char *title) { UiContainer *ct = uic_get_current_container(obj); UItab(ct, title); } /* * -------------------- Layout Functions -------------------- * * functions for setting layout attributes for the current container * */ void ui_layout_fill(UiObject *obj, UiBool fill) { UiContainer *ct = uic_get_current_container(obj); UIlayout_fill(ct, fill); } void ui_layout_hexpand(UiObject *obj, UiBool expand) { UiContainer *ct = uic_get_current_container(obj); UIlayout_hexpand(ct, expand); } void ui_layout_vexpand(UiObject *obj, UiBool expand) { UiContainer *ct = uic_get_current_container(obj); UIlayout_vexpand(ct, expand); } void ui_layout_gridwidth(UiObject *obj, int width) { UiContainer *ct = uic_get_current_container(obj); UIlayout_gridwidth(ct, width); } void ui_newline(UiObject *obj) { UiContainer *ct = uic_get_current_container(obj); UIlayout_newline(ct); }