Fix virtual keyboard

This commit is contained in:
Woody Hawthorne 2015-11-15 19:45:43 +11:00
parent c5daa2f62f
commit 9ea93ff8e5
2 changed files with 3 additions and 3 deletions

View file

@ -321,7 +321,7 @@ bool_t _gwinWMAdd(GHandle gh, const GWindowInit *pInit);
*/ */
void _gwinSendEvent(GHandle gh, GEventType type); 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. * @brief Move the focus off the current focus window.
* *

View file

@ -21,7 +21,7 @@
// Our listener for events for widgets // Our listener for events for widgets
static GListener gl; static GListener gl;
#if GFX_USE_GINPUT && GINPUT_NEED_KEYBOARD #if (GFX_USE_GINPUT && GINPUT_NEED_KEYBOARD) || GWIN_NEED_KEYBOARD
// Our current focus window // Our current focus window
static GHandle _widgetInFocus; static GHandle _widgetInFocus;
#endif #endif
@ -366,7 +366,7 @@ void _gwidgetInit(void)
geventRegisterCallback(&gl, gwidgetEvent, 0); geventRegisterCallback(&gl, gwidgetEvent, 0);
geventAttachSource(&gl, ginputGetMouse(GMOUSE_ALL_INSTANCES), GLISTEN_MOUSEMETA|GLISTEN_MOUSEDOWNMOVES); 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); geventAttachSource(&gl, ginputGetKeyboard(GKEYBOARD_ALL_INSTANCES), GLISTEN_KEYUP);
#endif #endif
} }