summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordas <das@noemail.net>2009-08-14 14:51:01 (GMT)
committerdas <das@noemail.net>2009-08-14 14:51:01 (GMT)
commit5b31158c0d3cf3bf601270f83f0fb00031c10045 (patch)
treee55f9c2f14c974a5fc96e863d8735bfdfe5cdbd4
parent40aa3c3c18b1349ec07685803b18fe8c08aaf8e8 (diff)
downloadtk-5b31158c0d3cf3bf601270f83f0fb00031c10045.zip
tk-5b31158c0d3cf3bf601270f83f0fb00031c10045.tar.gz
tk-5b31158c0d3cf3bf601270f83f0fb00031c10045.tar.bz2
* macosx/tkMacOSXWm.c: Workaround for textured windows being draggable
from opaque content areas. [Bug 2824538] (walzer) FossilOrigin-Name: 2caf03972c6ec713fd31ce6c6ffc421f87291b3d
-rw-r--r--ChangeLog9
-rw-r--r--macosx/tkMacOSXWm.c10
2 files changed, 18 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 58ba5de..5b08e80 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-08-14 Daniel Steffen <das@users.sourceforge.net>
+
+ * macosx/tkMacOSXDraw.c: Avoid exception in XCopyArea() when copying
+ from toplevel that has never been mapped. (reported by Youness Alaoui
+ on tcl-mac)
+
+ * macosx/tkMacOSXWm.c: Workaround for textured windows being draggable
+ from opaque content areas. [Bug 2824538] (walzer)
+
2009-08-10 Jan Nijtmans <nijtmans@users.sf.net>
* win/tkWinPixmap.c: Eliminate more gcc warnings
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index 17d4320..44a64a3 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -13,7 +13,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXWm.c,v 1.76 2009/07/06 20:29:21 dkf Exp $
+ * RCS: @(#) $Id: tkMacOSXWm.c,v 1.77 2009/08/14 14:51:02 das Exp $
*/
#include "tkMacOSXPrivate.h"
@@ -5342,6 +5342,14 @@ TkMacOSXMakeRealWindowExist(
if (styleMask & NSUtilityWindowMask) {
[(NSPanel*)window setFloatingPanel:YES];
}
+ if ((styleMask & (NSTexturedBackgroundWindowMask|NSHUDWindowMask)) &&
+ !(styleMask & NSDocModalWindowMask)) {
+ /*
+ * Workaround for [Bug 2824538]: Texured windows are draggable
+ * from opaque content.
+ */
+ [window setMovableByWindowBackground:NO];
+ }
[window setDocumentEdited:NO];
wmPtr->window = window;
macWin->view = contentView;