summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authordas <das>2006-10-31 13:56:58 (GMT)
committerdas <das>2006-10-31 13:56:58 (GMT)
commite34deb0d94616657c46d94284fa5f773f2c02f77 (patch)
treea42b42ce61d35763dbcc140b6d85c1cbe8d8e7d1 /generic
parent397a2c9832bf618f26be267501cf49ab06a562ec (diff)
downloadtk-e34deb0d94616657c46d94284fa5f773f2c02f77.zip
tk-e34deb0d94616657c46d94284fa5f773f2c02f77.tar.gz
tk-e34deb0d94616657c46d94284fa5f773f2c02f77.tar.bz2
* macosx/Wish.xcodeproj/project.pbxproj: add new Ttk files.
* macosx/ttkMacOSXTheme.c: standardize header #includes. * unix/Makefile (checkstubs, checkexports): check ttk.decls, allow export of Ttk prefixed symbols. * generic/ttk/tkDefaultTheme.c: fix warnings.
Diffstat (limited to 'generic')
-rw-r--r--generic/ttk/ttkDefaultTheme.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/generic/ttk/ttkDefaultTheme.c b/generic/ttk/ttkDefaultTheme.c
index 86f169a..dd7ad67 100644
--- a/generic/ttk/ttkDefaultTheme.c
+++ b/generic/ttk/ttkDefaultTheme.c
@@ -1,4 +1,4 @@
-/* $Id: ttkDefaultTheme.c,v 1.1 2006/10/31 01:42:26 hobbs Exp $
+/* $Id: ttkDefaultTheme.c,v 1.2 2006/10/31 13:56:58 das Exp $
*
* Copyright (c) 2003, Joe English
*
@@ -19,7 +19,9 @@ static const int WIN32_XDRAWLINE_HACK = 1;
static const int WIN32_XDRAWLINE_HACK = 0;
#endif
+#ifndef MIN
#define MIN(a,b) (a < b ? a : b)
+#endif
#define BORDERWIDTH 2
#define SCROLLBAR_WIDTH 14
@@ -738,7 +740,7 @@ static void MenubuttonArrowElementDraw(
int size = MENUBUTTON_ARROW_SIZE;
int postDirection = POST_BELOW;
ArrowDirection arrowDirection = ARROW_DOWN;
- int width, height;
+ int width = 0, height = 0;
Tk_GetPixelsFromObj(NULL, tkwin, arrow->sizeObj, &size);
Tcl_GetIndexFromObj(NULL, arrow->directionObj, directionStrings,