aboutsummaryrefslogtreecommitdiffstats
path: root/src/gwin/gwin_button.h
diff options
context:
space:
mode:
authorinmarket <andrewh@inmarket.com.au>2018-06-23 13:02:07 +1000
committerinmarket <andrewh@inmarket.com.au>2018-06-23 13:02:07 +1000
commit41271d632b74f5cf47c30d3b699eb6b2786f2136 (patch)
tree78bcb729c6d6177ca598f28908fefd186c50e9b6 /src/gwin/gwin_button.h
parent3b97fb798e96514057bcf17263c1e5dbdcd7da26 (diff)
downloaduGFX-41271d632b74f5cf47c30d3b699eb6b2786f2136.tar.gz
uGFX-41271d632b74f5cf47c30d3b699eb6b2786f2136.tar.bz2
uGFX-41271d632b74f5cf47c30d3b699eb6b2786f2136.zip
Added new type definitions - moving towards V3.0
Diffstat (limited to 'src/gwin/gwin_button.h')
-rw-r--r--src/gwin/gwin_button.h12
1 files changed, 2 insertions, 10 deletions
diff --git a/src/gwin/gwin_button.h b/src/gwin/gwin_button.h
index ba3bc354..ebbd88cb 100644
--- a/src/gwin/gwin_button.h
+++ b/src/gwin/gwin_button.h
@@ -58,10 +58,6 @@ typedef struct GButtonObject {
#endif
} GButtonObject;
-#ifdef __cplusplus
-extern "C" {
-#endif
-
/**
* @brief Create a button widget.
* @return NULL if there is no resultant drawing area, otherwise a window handle.
@@ -87,13 +83,13 @@ GHandle gwinGButtonCreate(GDisplay *g, GButtonObject *gb, const GWidgetInit *pIn
/**
* @brief Is the button current pressed
- * @return TRUE if the button is pressed
+ * @return gTrue if the button is pressed
*
* @param[in] gh The window handle (must be a button widget)
*
* @api
*/
-bool_t gwinButtonIsPressed(GHandle gh);
+gBool gwinButtonIsPressed(GHandle gh);
/**
* @defgroup Renderings_Button Renderings
@@ -222,10 +218,6 @@ void gwinButtonDraw_Normal(GWidgetObject *gw, void *param);
#endif
/** @} */
-#ifdef __cplusplus
-}
-#endif
-
#endif /* _GWIN_BUTTON_H */
/** @} */