diff options
Diffstat (limited to 'src/gwin/gwin_class.h')
| -rw-r--r-- | src/gwin/gwin_class.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/gwin/gwin_class.h b/src/gwin/gwin_class.h index 6d66e3d7..05a4bbf4 100644 --- a/src/gwin/gwin_class.h +++ b/src/gwin/gwin_class.h @@ -54,7 +54,7 @@ */ typedef struct gwinVMT { const char * classname; /**< The GWIN classname (mandatory) */ - size_t size; /**< The size of the class object */ + gMemSize size; /**< The size of the class object */ void (*Destroy) (GWindowObject *gh); /**< The GWIN destroy function (optional) */ void (*Redraw) (GWindowObject *gh); /**< The GWIN redraw routine (optional) */ void (*AfterClear) (GWindowObject *gh); /**< The GWIN after-clear function (optional) */ @@ -66,7 +66,7 @@ typedef struct gwinVMT { /** * @brief An toggle/dial instance is not being used */ - #define GWIDGET_NO_INSTANCE ((uint16_t)-1) + #define GWIDGET_NO_INSTANCE ((gU16)-1) /** * @brief The source handle that widgets use when sending events @@ -99,19 +99,19 @@ typedef struct gwinVMT { #endif #if GINPUT_NEED_TOGGLE struct { - uint16_t toggleroles; /**< The roles supported for toggles (0->toggleroles-1) */ - void (*ToggleAssign) (GWidgetObject *gw, uint16_t role, uint16_t instance); /**< Assign a toggle to a role (optional) */ - uint16_t (*ToggleGet) (GWidgetObject *gw, uint16_t role); /**< Return the instance for a particular role (optional) */ - void (*ToggleOff) (GWidgetObject *gw, uint16_t role); /**< Process toggle off events (optional) */ - void (*ToggleOn) (GWidgetObject *gw, uint16_t role); /**< Process toggle on events (optional) */ + gU16 toggleroles; /**< The roles supported for toggles (0->toggleroles-1) */ + void (*ToggleAssign) (GWidgetObject *gw, gU16 role, gU16 instance); /**< Assign a toggle to a role (optional) */ + gU16 (*ToggleGet) (GWidgetObject *gw, gU16 role); /**< Return the instance for a particular role (optional) */ + void (*ToggleOff) (GWidgetObject *gw, gU16 role); /**< Process toggle off events (optional) */ + void (*ToggleOn) (GWidgetObject *gw, gU16 role); /**< Process toggle on events (optional) */ }; #endif #if GINPUT_NEED_DIAL struct { - uint16_t dialroles; /**< The roles supported for dials (0->dialroles-1) */ - void (*DialAssign) (GWidgetObject *gw, uint16_t role, uint16_t instance); /**< Test the role and save the dial instance handle (optional) */ - uint16_t (*DialGet) (GWidgetObject *gw, uint16_t role); /**< Return the instance for a particular role (optional) */ - void (*DialMove) (GWidgetObject *gw, uint16_t role, uint16_t value, uint16_t max); /**< Process dial move events (optional) */ + gU16 dialroles; /**< The roles supported for dials (0->dialroles-1) */ + void (*DialAssign) (GWidgetObject *gw, gU16 role, gU16 instance); /**< Test the role and save the dial instance handle (optional) */ + gU16 (*DialGet) (GWidgetObject *gw, gU16 role); /**< Return the instance for a particular role (optional) */ + void (*DialMove) (GWidgetObject *gw, gU16 role, gU16 value, gU16 max); /**< Process dial move events (optional) */ }; #endif } gwidgetVMT; @@ -185,7 +185,7 @@ typedef struct gwinVMT { * * @notapi */ -GHandle _gwindowCreate(GDisplay *g, GWindowObject *pgw, const GWindowInit *pInit, const gwinVMT *vmt, uint32_t flags); +GHandle _gwindowCreate(GDisplay *g, GWindowObject *pgw, const GWindowInit *pInit, const gwinVMT *vmt, gU32 flags); /** * @brief Redraw the window after a status change. |