From e45f86668937a07b2f3dd3dd9ebb8c7028596b68 Mon Sep 17 00:00:00 2001 From: jenglish Date: Mon, 22 Dec 2008 18:34:55 +0000 Subject: 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) --- ChangeLog | 8 ++++++++ generic/ttk/ttkWidget.c | 6 +++--- 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 + + * 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 *** 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; -- cgit v0.12