diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2016-11-17 14:03:31 +0000 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2016-11-17 14:03:31 +0000 |
| commit | 7caad0c878e11d22a63377319dd317e2bab30280 (patch) | |
| tree | 7cdce74ab195c7ee89d64d8e6f1853526749baf0 /hw/xwin/wincreatewnd.c | |
| parent | 7e5c9bdf73e4185ac4cf7f044da0793a5cc3e62c (diff) | |
| parent | 3876fa25317449e95c8b44b0abfda72e91828a7d (diff) | |
Merge branch 'cygwin-patches-for-1.19' into cygwin-release-1.19xserver-cygwin-1.19.0-1
Diffstat (limited to 'hw/xwin/wincreatewnd.c')
| -rw-r--r-- | hw/xwin/wincreatewnd.c | 40 |
1 files changed, 5 insertions, 35 deletions
diff --git a/hw/xwin/wincreatewnd.c b/hw/xwin/wincreatewnd.c index e6e587f9f..c0421010d 100644 --- a/hw/xwin/wincreatewnd.c +++ b/hw/xwin/wincreatewnd.c @@ -72,18 +72,12 @@ winCreateBoundingWindowFullScreen(ScreenPtr pScreen) wc.cbClsExtra = 0; wc.cbWndExtra = 0; wc.hInstance = g_hInstance; - wc.hIcon = - (HICON) LoadImage(g_hInstance, MAKEINTRESOURCE(IDI_XWIN), IMAGE_ICON, - GetSystemMetrics(SM_CXICON), - GetSystemMetrics(SM_CYICON), 0); + wc.hIcon = pScreenInfo->hIcon; wc.hCursor = 0; wc.hbrBackground = 0; wc.lpszMenuName = NULL; wc.lpszClassName = WINDOW_CLASS; - wc.hIconSm = - (HICON) LoadImage(g_hInstance, MAKEINTRESOURCE(IDI_XWIN), IMAGE_ICON, - GetSystemMetrics(SM_CXSMICON), - GetSystemMetrics(SM_CYSMICON), LR_DEFAULTSIZE); + wc.hIconSm = pScreenInfo->hIconSm; RegisterClassEx(&wc); /* Set display and screen-specific tooltip text */ @@ -152,9 +146,6 @@ winCreateBoundingWindowWindowed(ScreenPtr pScreen) /* Decorated or undecorated window */ if (pScreenInfo->fDecoration -#ifdef XWIN_MULTIWINDOWEXTWM - && !pScreenInfo->fMWExtWM -#endif && !pScreenInfo->fRootless #ifdef XWIN_MULTIWINDOW && !pScreenInfo->fMultiWindow @@ -184,18 +175,12 @@ winCreateBoundingWindowWindowed(ScreenPtr pScreen) wc.cbClsExtra = 0; wc.cbWndExtra = 0; wc.hInstance = g_hInstance; - wc.hIcon = - (HICON) LoadImage(g_hInstance, MAKEINTRESOURCE(IDI_XWIN), IMAGE_ICON, - GetSystemMetrics(SM_CXICON), - GetSystemMetrics(SM_CYICON), 0); + wc.hIcon = pScreenInfo->hIcon; wc.hCursor = 0; wc.hbrBackground = (HBRUSH) GetStockObject(WHITE_BRUSH); wc.lpszMenuName = NULL; wc.lpszClassName = WINDOW_CLASS; - wc.hIconSm = - (HICON) LoadImage(g_hInstance, MAKEINTRESOURCE(IDI_XWIN), IMAGE_ICON, - GetSystemMetrics(SM_CXSMICON), - GetSystemMetrics(SM_CYSMICON), LR_DEFAULTSIZE); + wc.hIconSm = pScreenInfo->hIconSm; RegisterClassEx(&wc); /* Get size of work area */ @@ -216,9 +201,6 @@ winCreateBoundingWindowWindowed(ScreenPtr pScreen) /* Clean up the scrollbars flag, if necessary */ if ((!pScreenInfo->fDecoration -#ifdef XWIN_MULTIWINDOWEXTWM - || pScreenInfo->fMWExtWM -#endif || pScreenInfo->fRootless #ifdef XWIN_MULTIWINDOW || pScreenInfo->fMultiWindow @@ -239,9 +221,6 @@ winCreateBoundingWindowWindowed(ScreenPtr pScreen) /* Adjust the window width and height for borders and title bar */ if (pScreenInfo->fDecoration -#ifdef XWIN_MULTIWINDOWEXTWM - && !pScreenInfo->fMWExtWM -#endif && !pScreenInfo->fRootless #ifdef XWIN_MULTIWINDOW && !pScreenInfo->fMultiWindow @@ -290,9 +269,6 @@ winCreateBoundingWindowWindowed(ScreenPtr pScreen) /* Make sure window is no bigger than work area */ if (TRUE -#ifdef XWIN_MULTIWINDOWEXTWM - && !pScreenInfo->fMWExtWM -#endif #ifdef XWIN_MULTIWINDOW && !pScreenInfo->fMultiWindow #endif @@ -427,14 +403,11 @@ winCreateBoundingWindowWindowed(ScreenPtr pScreen) /* Show the window */ if (FALSE -#ifdef XWIN_MULTIWINDOWEXTWM - || pScreenInfo->fMWExtWM -#endif #ifdef XWIN_MULTIWINDOW || pScreenInfo->fMultiWindow #endif ) { -#if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM) +#ifdef XWIN_MULTIWINDOW pScreenPriv->fRootWindowShown = FALSE; #endif ShowWindow(*phwnd, SW_HIDE); @@ -448,9 +421,6 @@ winCreateBoundingWindowWindowed(ScreenPtr pScreen) /* Attempt to bring our window to the top of the display */ if (TRUE -#ifdef XWIN_MULTIWINDOWEXTWM - && !pScreenInfo->fMWExtWM -#endif && !pScreenInfo->fRootless #ifdef XWIN_MULTIWINDOW && !pScreenInfo->fMultiWindow |