Merged in woodyhawthorne/ugfx/fixes (pull request qmk#20)

Fixes
462shadow · Nov 15, 2015 · 697211a · 697211a
2 parents 10c047d + 9ea93ff
commit 697211a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/gmisc/gmisc.h b/src/gmisc/gmisc.h
@@ -75,7 +75,9 @@ typedef int32_t	fixed;
 /**
  * @brief   The famous number pi
  */
+#ifndef PI
 #define PI	3.1415926535897932384626433832795028841971693993751
+#endif
 
 /**
  * @brief   pi as a fixed point

diff --git a/src/gwin/gwin_class.h b/src/gwin/gwin_class.h
@@ -321,7 +321,7 @@ bool_t _gwinWMAdd(GHandle gh, const GWindowInit *pInit);
 	 */
 	void _gwinSendEvent(GHandle gh, GEventType type);
 
-	#if (GFX_USE_GINPUT && GINPUT_NEED_KEYBOARD) || defined(__DOXYGEN__)
+	#if ((GFX_USE_GINPUT && GINPUT_NEED_KEYBOARD) || GWIN_NEED_KEYBOARD) || defined(__DOXYGEN__)
 		/**
 		 * @brief	Move the focus off the current focus window.
 		 *

diff --git a/src/gwin/gwin_widget.c b/src/gwin/gwin_widget.c
@@ -21,7 +21,7 @@
 // Our listener for events for widgets
 static GListener gl;
 
-#if GFX_USE_GINPUT && GINPUT_NEED_KEYBOARD
+#if (GFX_USE_GINPUT && GINPUT_NEED_KEYBOARD) || GWIN_NEED_KEYBOARD
 	// Our current focus window
 	static GHandle				_widgetInFocus;
 #endif
@@ -366,7 +366,7 @@ void _gwidgetInit(void)
 	geventRegisterCallback(&gl, gwidgetEvent, 0);
 	geventAttachSource(&gl, ginputGetMouse(GMOUSE_ALL_INSTANCES), GLISTEN_MOUSEMETA|GLISTEN_MOUSEDOWNMOVES);
 
-	#if GINPUT_NEED_KEYBOARD
+	#if GINPUT_NEED_KEYBOARD || GWIN_NEED_KEYBOARD
 		geventAttachSource(&gl, ginputGetKeyboard(GKEYBOARD_ALL_INSTANCES), GLISTEN_KEYUP);
 	#endif
 }