From 286f8726d5453ecb05c16a29e0e652210e04bda9 Mon Sep 17 00:00:00 2001 From: tron Date: Wed, 27 Jul 2005 19:22:38 +0000 Subject: [PATCH] (svn r2725) Move MyShowCursor() back into win32.c, it fits better there --- video/win32_v.c | 12 +----------- video/win32_v.h | 2 -- win32.c | 11 +++++++++++ win32.h | 2 ++ 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/video/win32_v.c b/video/win32_v.c index 6710459ef8..d4e1ff1fa0 100644 --- a/video/win32_v.c +++ b/video/win32_v.c @@ -7,6 +7,7 @@ #include "../macros.h" #include "../network.h" #include "../variables.h" +#include "../win32.h" #include "../window.h" #include "win32_v.h" #include @@ -65,17 +66,6 @@ static void UpdatePalette(HDC dc, uint start, uint count) SetDIBColorTable(dc, start, count, rgb); } -bool MyShowCursor(bool show) -{ - if (_wnd.cursor_visible == show) - return show; - - _wnd.cursor_visible = show; - ShowCursor(show); - - return !show; -} - typedef struct { byte vk_from; byte vk_count; diff --git a/video/win32_v.h b/video/win32_v.h index ccc9aed942..c3b23a61a8 100644 --- a/video/win32_v.h +++ b/video/win32_v.h @@ -5,8 +5,6 @@ #include "../hal.h" -bool MyShowCursor(bool show); - extern const HalVideoDriver _win32_video_driver; #endif diff --git a/win32.c b/win32.c index d93b800e2e..e99490e9dc 100644 --- a/win32.c +++ b/win32.c @@ -40,6 +40,17 @@ static bool _has_console; #endif +bool MyShowCursor(bool show) +{ + if (_wnd.cursor_visible == show) return show; + + _wnd.cursor_visible = show; + ShowCursor(show); + + return !show; +} + + // Helper function needed by dynamically loading SDL bool LoadLibraryList(Function proc[], const char* dll) { diff --git a/win32.h b/win32.h index fb33a93ab9..f28481ff4e 100644 --- a/win32.h +++ b/win32.h @@ -3,6 +3,8 @@ #ifndef WIN32_H #define WIN32_H +bool MyShowCursor(bool show); + typedef void (*Function)(int); bool LoadLibraryList(Function proc[], const char* dll);