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)
commit1dfa20dc2208c729fdda01507ce68bb3acf8f11f (patch)
tree8671bd654853fe5c51513ef5fac9b4662e9fafea /unix
parent156da697fd3ae99c5b91741adc84eeb87dbfcb89 (diff)
parent1c1b81981040a4e1c56218886077a1b208efedbd (diff)
downloadtk-1dfa20dc2208c729fdda01507ce68bb3acf8f11f.zip
tk-1dfa20dc2208c729fdda01507ce68bb3acf8f11f.tar.gz
tk-1dfa20dc2208c729fdda01507ce68bb3acf8f11f.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