summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--generic/ttk/ttkWidget.c5
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 0d39614..17e5811 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-11 Joe English <jenglish@users.sourceforge.net>
+
+ * generic/ttk/ttkWidget.c(BeginDrawing): Don't crash when
+ application uses nondefault visual [Bug 2264732].
+
2008-11-11 Jan Nijtmans <nijtmans@users.sf.net>
* win/tcl.m4: reverted change from 2008-11-06 (was under the impression
diff --git a/generic/ttk/ttkWidget.c b/generic/ttk/ttkWidget.c
index 9d23198..66ab44c 100644
--- a/generic/ttk/ttkWidget.c
+++ b/generic/ttk/ttkWidget.c
@@ -1,4 +1,4 @@
-/* $Id: ttkWidget.c,v 1.16 2008/11/09 23:53:09 jenglish Exp $
+/* $Id: ttkWidget.c,v 1.17 2008/11/11 23:39:30 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 --