summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authordgp@users.sourceforge.net <dgp>2015-02-12 15:46:44 (GMT)
committerdgp@users.sourceforge.net <dgp>2015-02-12 15:46:44 (GMT)
commitb46ad04f120de8dfe3ce715b5eb9224536372a21 (patch)
tree4636bf6d4adfa461155bb5571aa0e1835f55aa0d /unix
parentfcffe80ed5d29427616c060e9cbaa40d563b9c1c (diff)
parentcfb60fe5ba86489ac38ed384bb4a99ab06d752a1 (diff)
downloadtk-b46ad04f120de8dfe3ce715b5eb9224536372a21.zip
tk-b46ad04f120de8dfe3ce715b5eb9224536372a21.tar.gz
tk-b46ad04f120de8dfe3ce715b5eb9224536372a21.tar.bz2
merge 8.5
Diffstat (limited to 'unix')
-rw-r--r--unix/tkUnixButton.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/unix/tkUnixButton.c b/unix/tkUnixButton.c
index 373f2e3..2101fda 100644
--- a/unix/tkUnixButton.c
+++ b/unix/tkUnixButton.c
@@ -360,7 +360,7 @@ TkpDisplayButton(
* warning. */
int y, relief;
Tk_Window tkwin = butPtr->tkwin;
- int width, height, fullWidth, fullHeight;
+ int width = 0, height = 0, fullWidth, fullHeight;
int textXOffset, textYOffset;
int haveImage = 0, haveText = 0;
int offset; /* 1 means this is a button widget, so we