summaryrefslogtreecommitdiffstats
path: root/generic/ttk
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2014-02-03 19:11:50 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2014-02-03 19:11:50 (GMT)
commit68c0b1ba3211be7946244c8d2b4db7d2c47d934f (patch)
tree113ac21074b1d648dd8f13845ecf088a64147e05 /generic/ttk
parent20bc7221f1c2e775d754f2e3616c8dd961c1481b (diff)
downloadtk-68c0b1ba3211be7946244c8d2b4db7d2c47d934f.zip
tk-68c0b1ba3211be7946244c8d2b4db7d2c47d934f.tar.gz
tk-68c0b1ba3211be7946244c8d2b4db7d2c47d934f.tar.bz2
Squash problem with native AIX cc not allowing direct macro redefinition.
Diffstat (limited to 'generic/ttk')
-rw-r--r--generic/ttk/ttkLabel.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/generic/ttk/ttkLabel.c b/generic/ttk/ttkLabel.c
index 597682f..d51388b 100644
--- a/generic/ttk/ttkLabel.c
+++ b/generic/ttk/ttkLabel.c
@@ -347,6 +347,8 @@ static void ImageDraw(
* Do not stipple at all under Aqua, just draw the image: it shows up
* as a white rectangle otherwise.
*/
+
+
if (state & TTK_STATE_DISABLED) {
if (TtkSelectImage(image->imageSpec, 0ul) == image->tkimg) {
#ifndef MAC_OSX_TK
@@ -484,6 +486,7 @@ static Ttk_ElementOptionSpec LabelElementOptions[] = {
* Calculate the text, image, and total width and height.
*/
+#undef MAX
#define MAX(a,b) ((a) > (b) ? a : b);
static void LabelSetup(
LabelElement *c, Tk_Window tkwin, Ttk_State state)