[vlc-commits] win32:vout_window: remove Winstore checks

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Thu Apr  4 09:30:27 2019 +0200| [ea8c4f43e9cfcf1369ff35f3488c9d35bc8ecc78] | committer: Steve Lhomme

win32:vout_window: remove Winstore checks

This window cannot be used in Winstore builds anyway and is not build there.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ea8c4f43e9cfcf1369ff35f3488c9d35bc8ecc78
---

 modules/video_output/win32/events.c | 4 ----
 modules/video_output/win32/window.c | 5 -----
 2 files changed, 9 deletions(-)

diff --git a/modules/video_output/win32/events.c b/modules/video_output/win32/events.c
index 6611951b4e..f55d8a6ef7 100644
--- a/modules/video_output/win32/events.c
+++ b/modules/video_output/win32/events.c
@@ -655,11 +655,7 @@ static int Win32VoutCreateWindow( event_thread_t *p_event )
     wc.hIcon         = 0;
     wc.hCursor       = p_event->is_cursor_hidden ? p_event->cursor_empty :
                                                    p_event->cursor_arrow;
-#if !VLC_WINSTORE_APP
     wc.hbrBackground = GetStockObject(BLACK_BRUSH);  /* background color */
-#else
-    wc.hbrBackground = NULL;
-#endif
     wc.lpszMenuName  = NULL;                                  /* no menu */
     wc.lpszClassName = p_event->class_main;       /* use a special class */
 
diff --git a/modules/video_output/win32/window.c b/modules/video_output/win32/window.c
index d096a47d2a..4aa2e76ccb 100644
--- a/modules/video_output/win32/window.c
+++ b/modules/video_output/win32/window.c
@@ -256,7 +256,6 @@ static long FAR PASCAL WinVoutEventProc( HWND hwnd, UINT message,
         {
         case IDM_TOGGLE_ON_TOP:            /* toggle the "on top" status */
         {
-            msg_Dbg(wnd, "WinProc WM_SYSCOMMAND: IDM_TOGGLE_ON_TOP");
             HMENU hMenu = GetSystemMenu(hwnd, FALSE);
             const bool is_on_top = (GetMenuState(hMenu, IDM_TOGGLE_ON_TOP, MF_BYCOMMAND) & MF_CHECKED) == 0;
             SetAbove( wnd, is_on_top ? VOUT_WINDOW_STATE_ABOVE : VOUT_WINDOW_STATE_NORMAL );
@@ -329,7 +328,6 @@ static void Close(vout_window_t *wnd)
     wnd->sys = NULL;
 }
 
-#if !VLC_WINSTORE_APP
 static int CALLBACK enumWindowsProc(HWND hwnd, LPARAM lParam)
 {
     HWND *wnd = (HWND *)lParam;
@@ -365,7 +363,6 @@ static HWND GetDesktopHandle(vlc_object_t *obj)
     EnumWindows( enumWindowsProc, (LPARAM)&hwnd );
     return hwnd;
 }
-#endif
 
 static void *EventThread( void *p_this )
 {
@@ -378,14 +375,12 @@ static void *EventThread( void *p_this )
 
     LONG i_window_style;
     HWND hwParent;
-#if !VLC_WINSTORE_APP
     if (var_InheritBool( wnd, "video-wallpaper" ))
     {
         hwParent = GetDesktopHandle(p_this);
         i_window_style = WS_CLIPCHILDREN|WS_CHILD;
     }
     else
-#endif
     {
         hwParent = 0;
         i_window_style = WS_OVERLAPPEDWINDOW | WS_SIZEBOX | WS_CLIPCHILDREN;