uGFX
/
ugfx
2
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

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

Fixes
ugfx_release_2.6
Joel Bodenmann 2015-11-15 12:17:32 +01:00
parent 10c047d0c0 9ea93ff8e5
commit 697211a85b
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gmisc/gmisc.h
View File

@ -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

2
src/gwin/gwin_class.h
View File

@ -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.
*

4
src/gwin/gwin_widget.c
View File

@ -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
}