summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordas <das>2005-08-22 11:54:19 (GMT)
committerdas <das>2005-08-22 11:54:19 (GMT)
commit6c3967704d759e1cf47471002f6e0a8d574f22e5 (patch)
treed9c5fdc4a1c45e916e2dc49228fce649462d4949
parentc30673f8047e10cd3e4aec093e5e1ce312f90f71 (diff)
downloadtk-6c3967704d759e1cf47471002f6e0a8d574f22e5.zip
tk-6c3967704d759e1cf47471002f6e0a8d574f22e5.tar.gz
tk-6c3967704d759e1cf47471002f6e0a8d574f22e5.tar.bz2
* macosx/tkMacOSXButton.c:
* macosx/tkMacOSXDialog.c: fix warnings.
-rw-r--r--ChangeLog5
-rw-r--r--macosx/tkMacOSXButton.c4
-rw-r--r--macosx/tkMacOSXDialog.c4
3 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 653c548..7229363 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-22 Daniel Steffen <das@users.sourceforge.net>
+
+ * macosx/tkMacOSXButton.c:
+ * macosx/tkMacOSXDialog.c: fix warnings.
+
2005-08-20 Joe Mistachkin <joe@mistachkin.com>
* win/tkWinX.c: Fixed bad cast. [Bug 1216006]
diff --git a/macosx/tkMacOSXButton.c b/macosx/tkMacOSXButton.c
index 597b310..bac175e 100644
--- a/macosx/tkMacOSXButton.c
+++ b/macosx/tkMacOSXButton.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXButton.c,v 1.13 2005/08/09 07:39:19 das Exp $
+ * RCS: @(#) $Id: tkMacOSXButton.c,v 1.14 2005/08/22 11:54:20 das Exp $
*/
#include "tkButton.h"
@@ -204,7 +204,7 @@ TkpDisplayButton(
int borderWidth;
Pixmap pixmap;
int wasUsingControl;
- int imageWidth, imageHeight;
+ int imageWidth = 0, imageHeight = 0;
int imageXOffset = 0, imageYOffset = 0; /* image information that will
* be used to restrict disabled
* pixmap as well */
diff --git a/macosx/tkMacOSXDialog.c b/macosx/tkMacOSXDialog.c
index b12cc67..d3c329e 100644
--- a/macosx/tkMacOSXDialog.c
+++ b/macosx/tkMacOSXDialog.c
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXDialog.c,v 1.14 2005/08/09 07:39:20 das Exp $
+ * RCS: @(#) $Id: tkMacOSXDialog.c,v 1.15 2005/08/22 11:54:20 das Exp $
*/
#include <Carbon/Carbon.h>
@@ -1291,7 +1291,7 @@ Tk_MessageBoxObjCmd(
int defaultNativeButtonIndex; /* 1, 2, 3: right to left. */
int typeIndex;
int i;
- int indexDefaultOption;
+ int indexDefaultOption = 0;
int result = TCL_OK;
static CONST char *movableAlertStrings[] = {