aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorinmarket <inmarket@ugfx.org>2017-04-01 13:22:30 +1000
committerinmarket <inmarket@ugfx.org>2017-04-01 13:22:30 +1000
commitd8526e672a4f488e140787c042351604be9aaa77 (patch)
treeb8069c41ed00cf887fe82c02baa8c1885752a702 /drivers
parent252b3b918a398c5225cc75cd1a67d9cf7dd3903b (diff)
downloaduGFX-d8526e672a4f488e140787c042351604be9aaa77.tar.gz
uGFX-d8526e672a4f488e140787c042351604be9aaa77.tar.bz2
uGFX-d8526e672a4f488e140787c042351604be9aaa77.zip
Fix some prototypes for win32.raw32 emulation environments
Diffstat (limited to 'drivers')
-rw-r--r--drivers/multiple/Win32/gdisp_lld_Win32.c4
-rw-r--r--drivers/multiple/Win32/gdisp_lld_config.h6
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/multiple/Win32/gdisp_lld_Win32.c b/drivers/multiple/Win32/gdisp_lld_Win32.c
index 7bb6d137..420360a3 100644
--- a/drivers/multiple/Win32/gdisp_lld_Win32.c
+++ b/drivers/multiple/Win32/gdisp_lld_Win32.c
@@ -440,7 +440,7 @@ typedef struct winPriv {
uint16_t mousebuttons;
GMouse *mouse;
bool_t mouseenabled;
- void (*capfn)(HWND hWnd, GDisplay *g, uint16_t buttons, coord_t x, coord_t y);
+ void (*capfn)(void * hWnd, GDisplay *g, uint16_t buttons, coord_t x, coord_t y);
#endif
#if GFX_USE_GINPUT && GINPUT_NEED_TOGGLE
uint8_t toggles;
@@ -469,7 +469,7 @@ void gfxEmulatorSetParentWindow(void *hwnd) {
void gfxEmulatorMouseEnable(GDisplay *g, bool_t enabled) {
((winPriv *)g->priv)->mouseenabled = enabled;
}
- void gfxEmulatorMouseCapture(GDisplay *g, void (*capfn)(HWND hWnd, GDisplay *g, uint16_t buttons, coord_t x, coord_t y)) {
+ void gfxEmulatorMouseCapture(GDisplay *g, void (*capfn)(void * hWnd, GDisplay *g, uint16_t buttons, coord_t x, coord_t y)) {
((winPriv *)g->priv)->capfn = capfn;
}
#endif
diff --git a/drivers/multiple/Win32/gdisp_lld_config.h b/drivers/multiple/Win32/gdisp_lld_config.h
index 53f8bff7..4178a948 100644
--- a/drivers/multiple/Win32/gdisp_lld_config.h
+++ b/drivers/multiple/Win32/gdisp_lld_config.h
@@ -56,13 +56,13 @@ void gfxEmulatorSetParentWindow(void *hwnd);
#if GINPUT_NEED_MOUSE
// This function allows you to inject mouse events into the ugfx mouse driver
void gfxEmulatorMouseInject(GDisplay *g, uint16_t buttons, coord_t x, coord_t y);
-
+
// This function enables you to turn on/off normal mouse functions on a ugfx Win32 display window.
void gfxEmulatorMouseEnable(GDisplay *g, bool_t enabled);
-
+
// This function enables you to capture mouse events on a ugfx Win32 display window.
// Passing NULL turns off the capture
- void gfxEmulatorMouseCapture(GDisplay *g, void (*capfn)(HWND hWnd, GDisplay *g, uint16_t buttons, coord_t x, coord_t y));
+ void gfxEmulatorMouseCapture(GDisplay *g, void (*capfn)(void * hWnd, GDisplay *g, uint16_t buttons, coord_t x, coord_t y));
#endif
#endif /* GFX_USE_GDISP */