merged 1.3 r989:990 into trunk and 1.4

2011-05-12 22:37:57 +00:00 · 2011-05-12 22:37:57 +00:00 · 5b0bc93b00
parent 52edb17015
commit 5b0bc93b00
1 changed files with 1 additions and 4 deletions
--- a/src/test/integtests/platform/CXWindowsClipboardTests.cpp
+++ b/src/test/integtests/platform/CXWindowsClipboardTests.cpp
@ -36,10 +36,7 @@ protected:
 		
 		m_window = XCreateWindow(
 			m_display, root, 0, 0, 1, 1, 0, 0,
-			InputOnly, CopyFromParent,
-			CWDontPropagate | CWEventMask |
-			CWOverrideRedirect | CWCursor,
-			&attr);
+			InputOnly, CopyFromParent, 0, &attr);
 	}

 	virtual void