summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjenglish <jenglish@flightlab.com>2008-12-22 18:34:55 (GMT)
committerjenglish <jenglish@flightlab.com>2008-12-22 18:34:55 (GMT)
commite45f86668937a07b2f3dd3dd9ebb8c7028596b68 (patch)
tree0c4c2ba0322bf4d7e99e8d695f6a7860970e8d7d
parentcef6ca071550bc96fcce2dbaa03e9b78e1d1ac24 (diff)
downloadtk-e45f86668937a07b2f3dd3dd9ebb8c7028596b68.zip
tk-e45f86668937a07b2f3dd3dd9ebb8c7028596b68.tar.gz
tk-e45f86668937a07b2f3dd3dd9ebb8c7028596b68.tar.bz2
Don't crash when application uses nondefault visual [Bug 2264732]
(Backport from trunk change 2008-11-11) Workaround for [Bug 2207435] (Backport from trunk change 2008-10-31)
-rw-r--r--ChangeLog8
-rw-r--r--generic/ttk/ttkWidget.c6
2 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 9c24d39..ad432c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-12-22 Joe English <jenglish@users.sourceforge.net>
+
+ * generic/ttk/ttkWidget.c: Don't crash when
+ application uses nondefault visual [Bug 2264732]
+ (Backport from trunk change 2008-11-11)
+ * Workaround for [Bug 2207435]
+ (Backport from trunk change 2008-10-31).
+
2008-12-22 Don Porter <dgp@users.sourceforge.net>
*** 8.5.6 TAGGED FOR RELEASE ***
diff --git a/generic/ttk/ttkWidget.c b/generic/ttk/ttkWidget.c
index ae00a32..5f05ab4 100644
--- a/generic/ttk/ttkWidget.c
+++ b/generic/ttk/ttkWidget.c
@@ -1,4 +1,4 @@
-/* $Id: ttkWidget.c,v 1.11 2008/01/06 22:35:41 jenglish Exp $
+/* $Id: ttkWidget.c,v 1.11.2.1 2008/12/22 18:34:55 jenglish Exp $
* Copyright (c) 2003, Joe English
*
* Core widget utilities.
@@ -61,8 +61,7 @@ static void SizeChanged(WidgetCore *corePtr)
static Drawable BeginDrawing(Tk_Window tkwin)
{
return Tk_GetPixmap(Tk_Display(tkwin), Tk_WindowId(tkwin),
- Tk_Width(tkwin), Tk_Height(tkwin),
- DefaultDepthOfScreen(Tk_Screen(tkwin)));
+ Tk_Width(tkwin), Tk_Height(tkwin),Tk_Depth(tkwin));
}
/* EndDrawing --
@@ -270,6 +269,7 @@ static void CoreEventProc(ClientData clientData, XEvent *eventPtr)
corePtr->widgetSpec->cleanupProc(corePtr);
+ Tk_UndefineCursor(corePtr->tkwin); /* workaround for #2207435 */
Tk_FreeConfigOptions(
clientData, corePtr->optionTable, corePtr->tkwin);
corePtr->tkwin = NULL;