Fix virtual keyboard

462shadow · Nov 15, 2015 · 9ea93ff · 9ea93ff
1 parent c5daa2f
commit 9ea93ff
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
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
 }