Commit 534aea27 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

MSW: fix WinCE compilation after Cursors modification

(cherry picked from commit 29d478ff1e54a3390f576da3c8af937b61a3b0d7)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 0a2f5418
...@@ -170,6 +170,7 @@ static void UpdateCursor( event_thread_t *p_event, bool b_show ) ...@@ -170,6 +170,7 @@ static void UpdateCursor( event_thread_t *p_event, bool b_show )
} }
} }
#ifndef UNDER_CE
static HCURSOR EmptyCursor( HINSTANCE instance ) static HCURSOR EmptyCursor( HINSTANCE instance )
{ {
const int cw = GetSystemMetrics(SM_CXCURSOR); const int cw = GetSystemMetrics(SM_CXCURSOR);
...@@ -189,6 +190,7 @@ static HCURSOR EmptyCursor( HINSTANCE instance ) ...@@ -189,6 +190,7 @@ static HCURSOR EmptyCursor( HINSTANCE instance )
return cursor; return cursor;
} }
#endif
static void MousePressed( event_thread_t *p_event, HWND hwnd, unsigned button ) static void MousePressed( event_thread_t *p_event, HWND hwnd, unsigned button )
{ {
...@@ -530,7 +532,9 @@ static int DirectXCreateWindow( event_thread_t *p_event ) ...@@ -530,7 +532,9 @@ static int DirectXCreateWindow( event_thread_t *p_event )
} }
#endif #endif
p_event->cursor_arrow = LoadCursor(NULL, IDC_ARROW); p_event->cursor_arrow = LoadCursor(NULL, IDC_ARROW);
#ifndef UNDER_CE
p_event->cursor_empty = EmptyCursor(hInstance); p_event->cursor_empty = EmptyCursor(hInstance);
#endif
/* Get the Icon from the main app */ /* Get the Icon from the main app */
vlc_icon = NULL; vlc_icon = NULL;
...@@ -711,7 +715,9 @@ static void DirectXCloseWindow( event_thread_t *p_event ) ...@@ -711,7 +715,9 @@ static void DirectXCloseWindow( event_thread_t *p_event )
UnregisterClass( p_event->class_video, hInstance ); UnregisterClass( p_event->class_video, hInstance );
UnregisterClass( p_event->class_main, hInstance ); UnregisterClass( p_event->class_main, hInstance );
#ifndef UNDER_CE
DestroyCursor( p_event->cursor_empty ); DestroyCursor( p_event->cursor_empty );
#endif
} }
/***************************************************************************** /*****************************************************************************
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment