aboutsummaryrefslogtreecommitdiffstats
path: root/src/gwin/frame.h
diff options
context:
space:
mode:
authorinmarket <andrewh@inmarket.com.au>2014-05-10 18:20:05 +1000
committerinmarket <andrewh@inmarket.com.au>2014-05-10 18:20:05 +1000
commit5544202a26da6ec74c51eb1bac9499d434b133ba (patch)
tree5533f2b5854270c94e395e6693272735559cf8a0 /src/gwin/frame.h
parent890653111b978f13b9f168c7308926d7e6a04e6c (diff)
downloaduGFX-5544202a26da6ec74c51eb1bac9499d434b133ba.tar.gz
uGFX-5544202a26da6ec74c51eb1bac9499d434b133ba.tar.bz2
uGFX-5544202a26da6ec74c51eb1bac9499d434b133ba.zip
All compiling.
Containers and Frames still to be tested.
Diffstat (limited to 'src/gwin/frame.h')
-rw-r--r--src/gwin/frame.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gwin/frame.h b/src/gwin/frame.h
index 9d1d63fb..1b20b931 100644
--- a/src/gwin/frame.h
+++ b/src/gwin/frame.h
@@ -31,7 +31,7 @@
#define GWIN_FRAME_MINMAX_BTN (GWIN_FIRST_CONTROL_FLAG << 2)
typedef struct GFrameObject {
- GWidgetObject w;
+ GContainerObject gc;
GListener gl; // internal listener for the buttons
// These could probably be removed... I have to think harder later
@@ -60,7 +60,7 @@ typedef struct GFrameObject {
*
* @api
*/
-GHandle gwinGFrameCreate(GDisplay *g, GFrameObject *fo, GWidgetInit *pInit, uint16_t flags);
+GHandle gwinGFrameCreate(GDisplay *g, GFrameObject *fo, GWidgetInit *pInit, uint32_t flags);
#define gwinFrameCreate(fo, pInit, flags) gwinGFrameCreate(GDISP, fo, pInit, flags);
#endif /* _GWIN_FRAME_H */