diff options
| author | inmarket <andrewh@inmarket.com.au> | 2014-05-10 18:20:05 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2014-05-10 18:20:05 +1000 |
| commit | 5544202a26da6ec74c51eb1bac9499d434b133ba (patch) | |
| tree | 5533f2b5854270c94e395e6693272735559cf8a0 /src/gwin/class_gwin.h | |
| parent | 890653111b978f13b9f168c7308926d7e6a04e6c (diff) | |
| download | uGFX-5544202a26da6ec74c51eb1bac9499d434b133ba.tar.gz uGFX-5544202a26da6ec74c51eb1bac9499d434b133ba.tar.bz2 uGFX-5544202a26da6ec74c51eb1bac9499d434b133ba.zip | |
All compiling.
Containers and Frames still to be tested.
Diffstat (limited to 'src/gwin/class_gwin.h')
| -rw-r--r-- | src/gwin/class_gwin.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gwin/class_gwin.h b/src/gwin/class_gwin.h index e3b5e2e3..b38b6bb8 100644 --- a/src/gwin/class_gwin.h +++ b/src/gwin/class_gwin.h @@ -121,8 +121,8 @@ typedef struct gwinVMT { */ typedef struct gcontainerVMT { gwidgetVMT gw; - void (*Pos2Screen) (GHandle gh, coord_t *px, coord_t *py); // @< Translate client coords into absolute coords (mandatory) - void (*Size2Screen) (GHandle gh, coord_t *pwidth, coord_t *pheight); // @< Ensure a window fits in the parent client area (mandatory) + void (*AdjustPosition) (GHandle gh, coord_t *px, coord_t *py); // @< The container can adjust the relative position of a child (optional) + void (*AdjustSize) (GHandle gh, coord_t *pwidth, coord_t *pheight); // @< The container can adjust the size of a child (optional) void (*NotifyAdd) (GHandle gh, GHandle ghChild); // @< Notification that a child has been added (optional) void (*NotifyDelete) (GHandle gh, GHandle ghChild); // @< Notification that a child has been deleted (optional) } gcontainerVMT; @@ -274,7 +274,7 @@ GHandle _gwindowCreate(GDisplay *g, GWindowObject *pgw, const GWindowInit *pInit * * @notapi */ - #define _gcontainerRedraw(gh) _gwidgetRedraw(gh) + void _gcontainerRedraw(GHandle gh); /** * @brief Redraw the Container object after a container status change. @@ -285,7 +285,7 @@ GHandle _gwindowCreate(GDisplay *g, GWindowObject *pgw, const GWindowInit *pInit * * @notapi */ - #define _gcontainerUpdate(gh) _gwidgetUpdate(gh) + void _gcontainerUpdate(GHandle gh); /** * @brief Apply the specified action to a window and its children. |