uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Revert "initial work on GGroup"

Browse Source 
This reverts commit 3a08f65cfc.
This commit is contained in:
Joel Bodenmann 2014-02-01 22:42:44 +01:00
parent 84367d080f
commit 7ef4d1e0d4
3 changed files with 2 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
include/gwin/ggroup.h
View File

@ -1,46 +0,0 @@
/*
* This file is subject to the terms of the GFX License. If a copy of
* the license was not distributed with this file, you can obtain one at:
*
* http://ugfx.org/license.html
*/
/**
* @file include/gwin/ggroup.h
* @brief GWIN Widgets header file.
*/
#ifndef _GGROUP_H
#define _GGROUP_H
/* This file is included within "gwin/gwin.h" */
/**
* @defgroup Widget Widget
* @ingroup GWIN
*
* @details Groups provide parent/child relation features and dynamic layouts.
*
* @pre GFX_NEED_GWIN needs to be set to TRUE in your gfxconf.h.
* @pre GWIN_NEED_GROUPS needs to be set to TRUE in your gfxconf.h.
*
* @{
*/
/**
* @brief A group object structure
* @note Do not access the members directly. Treat it as a black-box and use the method functions.
* @{
*/
typedef struct GGroupObject {
GWindowObject g;
GHandle parent; // @< The parent widget
GHandle sibling; // @< The widget to its left (add right later as well)
GHandle child; // @< The child widget
} GGroupObject;
/** @} */
#endif /* _GGROUP_H */

9
include/gwin/gwin.h
View File

@ -55,7 +55,7 @@ typedef struct GWindowObject {
GHandle child; // @< The child widget GHandle child; // @< The child widget
#endif #endif
} GWindowObject, * GHandle; } GWindowObject, * GHandle;
/** @} */ /* @} */
/** /**
* @brief The structure to initialise a GWIN. * @brief The structure to initialise a GWIN.
@ -70,7 +70,7 @@ typedef struct GWindowInit {
coord_t width, height; // @< The initial dimension coord_t width, height; // @< The initial dimension
bool_t show; // @< Should the window be visible initially bool_t show; // @< Should the window be visible initially
} GWindowInit; } GWindowInit;
/** @} */ /* @} */
/** /**
* @brief A window's minimized, maximized or normal size * @brief A window's minimized, maximized or normal size
@ -906,11 +906,6 @@ extern "C" {
* Additional functionality * Additional functionality
*-------------------------------------------------*/ *-------------------------------------------------*/
/* Include groups */
#if GWIN_NEED_GROUPS || defined(__DOXYGEN__)
#include "gwin/ggroup.h"
#endif
/* Include widgets */ /* Include widgets */
#if GWIN_NEED_WIDGET || defined(__DOXYGEN__) #if GWIN_NEED_WIDGET || defined(__DOXYGEN__)
#include "gwin/gwidget.h" #include "gwin/gwidget.h"

26
src/gwin/ggroup.c
View File

@ -1,26 +0,0 @@
/*
* This file is subject to the terms of the GFX License. If a copy of
* the license was not distributed with this file, you can obtain one at:
*
* http://ugfx.org/license.html
*/
#include "gfx.h"
#if GFX_USE_GWIN && GWIN_NEED_GROUPS
#include "gwin/class_gwin.h"
GHandle _ggroupCreate(GDisplay *g, GGroupObject *go, const GGroupInit *pInit) {
if (!(go = (GGroupObject *)_gwindowCreate(g, &go->g, &pInit->g, &vmt->g, GWIN_FLG_GROUP|GWIN_FLG_ENABLED)))
return NULL;
go->parent = NULL;
go->sibling = NULL;
go->child = NULL;
return &go->g;
}
#endif /* GFX_USE_GWIN && GWIN_NEED_GROUPS */