summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2015-02-12 15:46:44 (GMT)
committerdgp <dgp@users.sourceforge.net>2015-02-12 15:46:44 (GMT)
commitdf484886ee83a07e5258631a6792a87d50363e3b (patch)
tree8671bd654853fe5c51513ef5fac9b4662e9fafea /unix
parent9d499d40e2c4efef4b2b2cbdc776ef3b7bed9610 (diff)
parentc7d61158224fc5925e7352a253eb2f7c17e20833 (diff)
downloadtk-df484886ee83a07e5258631a6792a87d50363e3b.zip
tk-df484886ee83a07e5258631a6792a87d50363e3b.tar.gz
tk-df484886ee83a07e5258631a6792a87d50363e3b.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