From 0336e245e130f168b0f8d57c18f0da7bccaeb16d Mon Sep 17 00:00:00 2001 From: fvogel Date: Wed, 18 Jul 2012 18:38:42 +0000 Subject: [Bug 3545457]: Crash on packing a menubutton --- ChangeLog | 4 ++++ unix/tkUnixMenubu.c | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index bb34f20..77499c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2012-07-?? Francois Vogel + + * unix/tkUnixMenuBu.c: [Bug 3545457]: Crash on packing a menubutton + 2012-07-17 Jan Nijtmans * win/makefile.vc: [Bug 3544932]: Visual studio compiler check fails diff --git a/unix/tkUnixMenubu.c b/unix/tkUnixMenubu.c index 35c7da8..785fb75 100644 --- a/unix/tkUnixMenubu.c +++ b/unix/tkUnixMenubu.c @@ -74,10 +74,12 @@ TkpDisplayMenuButton(clientData) * compiler warning. */ int y = 0; register Tk_Window tkwin = mbPtr->tkwin; - int width, height, fullWidth, fullHeight; + int fullWidth, fullHeight; int textXOffset, textYOffset; int imageWidth, imageHeight; - int imageXOffset, imageYOffset; /* image information that will be used to + int imageXOffset, imageYOffset; + int width = 0, height = 0; + /* image information that will be used to * restrict disabled pixmap as well */ int haveImage = 0, haveText = 0; -- cgit v0.12 From 314639c09d207b2fcb8cf5429da94e238c09fb66 Mon Sep 17 00:00:00 2001 From: fvogel Date: Thu, 19 Jul 2012 21:35:27 +0000 Subject: Fixed previous commit date in changelog --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 77499c5..587333d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -2012-07-?? Francois Vogel +2012-07-19 Francois Vogel * unix/tkUnixMenuBu.c: [Bug 3545457]: Crash on packing a menubutton -- cgit v0.12