diff options
| author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-11-29 12:34:55 +0000 |
|---|---|---|
| committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-11-29 12:34:55 +0000 |
| commit | 59ccc6465ca15e046ad11362ae5fbb3c71d2c148 (patch) | |
| tree | aeee668a9ddfcf7b13c590d9c715724f19936841 | |
| parent | df2f2ff5a4ebf6c5289da64bf3f572341a0f7656 (diff) | |
Fixed windows.h include for cygwin.
Bugzilla #1945: Stop unnecessary reordering.
| -rw-r--r-- | hw/xwin/ChangeLog | 8 | ||||
| -rw-r--r-- | hw/xwin/winmultiwindowwindow.c | 3 | ||||
| -rw-r--r-- | hw/xwin/winmultiwindowwm.c | 7 |
3 files changed, 17 insertions, 1 deletions
diff --git a/hw/xwin/ChangeLog b/hw/xwin/ChangeLog index 7a0d7b599..fb5904d95 100644 --- a/hw/xwin/ChangeLog +++ b/hw/xwin/ChangeLog @@ -1,3 +1,11 @@ +2004-11-29 Kensuke Matsuzaki <zakki@peppermint.jp> + + * winmultiwindowwm.c: + Fixed windows.h include for cygwin. + + * winmultiwindowwindow.c: + Bugzilla #1945: Stop unnecessary reordering. + 2004-11-24 Alexander Gottwald <ago at freedesktop dot org> * winmultiwindowwm.c: diff --git a/hw/xwin/winmultiwindowwindow.c b/hw/xwin/winmultiwindowwindow.c index f1c6e417a..fcea36c96 100644 --- a/hw/xwin/winmultiwindowwindow.c +++ b/hw/xwin/winmultiwindowwindow.c @@ -394,7 +394,8 @@ winRestackWindowMultiWindow (WindowPtr pWin, WindowPtr pOldNextSib) * Calling winReorderWindowsMultiWindow here means our window manager * (i.e. Windows Explorer) has initiative to determine Z order. */ - winReorderWindowsMultiWindow (); + if (pWin->nextSib != pOldNextSib) + winReorderWindowsMultiWindow (); #else /* Bail out if no window privates or window handle is invalid */ if (!pWinPriv || !pWinPriv->hWnd) diff --git a/hw/xwin/winmultiwindowwm.c b/hw/xwin/winmultiwindowwm.c index c737ac05f..ccd1c8099 100644 --- a/hw/xwin/winmultiwindowwm.c +++ b/hw/xwin/winmultiwindowwm.c @@ -48,7 +48,14 @@ #include <X11/cursorfont.h> /* Windows headers */ +#ifdef __CYGWIN__ +/* Fixups to prevent collisions between Windows and X headers */ +#define ATOM DWORD + +#include <windows.h> +#else #include <Xwindows.h> +#endif /* Local headers */ #include "obj_base.h" |