From b55fa551e367ec4ce927970fd551b5055bc80c25 Mon Sep 17 00:00:00 2001
From: Joel Bodenmann <joel@unormal.org>
Date: Wed, 25 Jun 2014 23:04:44 +0200
Subject: macro typo

---
 src/gwin/class_gwin.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/gwin')

diff --git a/src/gwin/class_gwin.h b/src/gwin/class_gwin.h
index 61a27447..995121b7 100644
--- a/src/gwin/class_gwin.h
+++ b/src/gwin/class_gwin.h
@@ -98,7 +98,7 @@ typedef struct gwinVMT {
 				void (*ToggleOn)		(GWidgetObject *gw, uint16_t role);						// @< Process toggle on events (optional)
 			};
 		#endif
-		#if GINPUT_NEED_TOGGLE
+		#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)
-- 
cgit v1.2.3


From bd68d6a00a5e9092a05d736916ebbdafe8b31f5b Mon Sep 17 00:00:00 2001
From: Joel Bodenmann <joel@unormal.org>
Date: Mon, 30 Jun 2014 14:27:33 +0200
Subject: checkbox c++ fix

---
 src/gwin/checkbox.h | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src/gwin')

diff --git a/src/gwin/checkbox.h b/src/gwin/checkbox.h
index c124078e..2b1fb801 100644
--- a/src/gwin/checkbox.h
+++ b/src/gwin/checkbox.h
@@ -48,6 +48,10 @@ typedef struct GCheckboxObject {
 	#endif
 } GCheckboxObject;
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @brief				Create a checkbox window.
  * @return				NULL if there is no resultant drawing area, otherwise a window handle.
@@ -111,6 +115,10 @@ void gwinCheckboxDraw_CheckOnLeft(GWidgetObject *gw, void *param);
 void gwinCheckboxDraw_CheckOnRight(GWidgetObject *gw, void *param);
 /** @} */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _GWIN_CHECKBOX_H */
 /** @} */
 
-- 
cgit v1.2.3