diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2012-04-17 11:03:26 +0100 |
|---|---|---|
| committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2012-04-17 11:03:26 +0100 |
| commit | f15718ae19a42dd4ffc7046142f27ff322d9878e (patch) | |
| tree | 8474afe564bce18ecf63b9d031090c5c69ed63f9 | |
| parent | fb55dbf344c479b0db97bc3f42c72d08b5726d78 (diff) | |
| parent | c812561a7bda569e5ca936a90245b785d1d78d81 (diff) | |
Merge branch 'cygwin-patches-for-1.12' into cygwin-release-1.12xserver-cygwin-1.12.0-4
| -rw-r--r-- | hw/xwin/winmonitors.c | 4 | ||||
| -rw-r--r-- | hw/xwin/winmultiwindowwm.c | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/hw/xwin/winmonitors.c b/hw/xwin/winmonitors.c index 5484209a9..3f65d2498 100644 --- a/hw/xwin/winmonitors.c +++ b/hw/xwin/winmonitors.c @@ -63,5 +63,7 @@ Bool QueryMonitor(int index, struct GetMonitorInfoData *data) data->requestedMonitor = index; /* query information */ - return EnumDisplayMonitors(NULL, NULL, getMonitorInfo, (LPARAM) data); + EnumDisplayMonitors(NULL, NULL, getMonitorInfo, (LPARAM) data); + + return TRUE; } diff --git a/hw/xwin/winmultiwindowwm.c b/hw/xwin/winmultiwindowwm.c index a33d17eae..5eae76dba 100644 --- a/hw/xwin/winmultiwindowwm.c +++ b/hw/xwin/winmultiwindowwm.c @@ -1961,6 +1961,9 @@ winApplyHints (Display *pDisplay, Window iWindow, HWND hWnd, HWND *zstyle) if (hint & HINT_NOSYSMENU) style = style & ~WS_SYSMENU; + if (hint & HINT_SKIPTASKBAR) + style = style & ~WS_MINIMIZEBOX; /* window will become lost if minimized */ + SetWindowLongPtr (hWnd, GWL_STYLE, style); /* now we have iTaskbar, use that as well */ |