diff options
| author | das <das> | 2009-06-29 14:35:01 (GMT) |
|---|---|---|
| committer | das <das> | 2009-06-29 14:35:01 (GMT) |
| commit | 8f9b8fd63b4da5f6f27b46c438c89f2baa15f0e8 (patch) | |
| tree | 81b5743d2ff5d45f2ee4992153e4f34949ea8f8a /macosx/tkMacOSXDefault.h | |
| parent | e4a87c21cb59539eeddcc65d359e9b06d597fed3 (diff) | |
| download | tk-8f9b8fd63b4da5f6f27b46c438c89f2baa15f0e8.zip tk-8f9b8fd63b4da5f6f27b46c438c89f2baa15f0e8.tar.gz tk-8f9b8fd63b4da5f6f27b46c438c89f2baa15f0e8.tar.bz2 | |
Merge of TkAqua Cocoa portmacosx_cocoa_merge
Diffstat (limited to 'macosx/tkMacOSXDefault.h')
| -rw-r--r-- | macosx/tkMacOSXDefault.h | 32 |
1 files changed, 25 insertions, 7 deletions
diff --git a/macosx/tkMacOSXDefault.h b/macosx/tkMacOSXDefault.h index cedbbcc..f6cccdd 100644 --- a/macosx/tkMacOSXDefault.h +++ b/macosx/tkMacOSXDefault.h @@ -6,18 +6,22 @@ * * Copyright (c) 1991-1994 The Regents of the University of California. * Copyright (c) 1994-1997 Sun Microsystems, Inc. - * Copyright 2001, Apple Computer, Inc. - * Copyright (c) 2006-2007 Daniel A. Steffen <das@users.sourceforge.net> + * Copyright 2001-2009, Apple Inc. + * Copyright (c) 2006-2009 Daniel A. Steffen <das@users.sourceforge.net> * * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXDefault.h,v 1.17 2008/12/06 10:48:29 dkf Exp $ + * RCS: @(#) $Id: tkMacOSXDefault.h,v 1.18 2009/06/29 14:35:01 das Exp $ */ #ifndef _TKMACDEFAULT #define _TKMACDEFAULT +#ifndef TK_MAC_BUTTON_USE_COMPATIBILITY_METRICS +#define TK_MAC_BUTTON_USE_COMPATIBILITY_METRICS 1 +#endif + /* * The definitions below provide symbolic names for the default colors. * NORMAL_BG - Normal background color. @@ -70,7 +74,12 @@ #define DEF_BUTTON_HIGHLIGHT_BG_MONO DEF_BUTTON_BG_MONO #define DEF_BUTTON_HIGHLIGHT "systemButtonFrame" #define DEF_LABEL_HIGHLIGHT_WIDTH "0" +#if TK_MAC_BUTTON_USE_COMPATIBILITY_METRICS #define DEF_BUTTON_HIGHLIGHT_WIDTH "4" +#define DEF_BUTTON_HIGHLIGHT_WIDTH_NOCM "1" +#else +#define DEF_BUTTON_HIGHLIGHT_WIDTH "1" +#endif #define DEF_BUTTON_IMAGE ((char *) NULL) #define DEF_BUTTON_INDICATOR "1" #define DEF_BUTTON_JUSTIFY "center" @@ -78,9 +87,19 @@ #define DEF_BUTTON_ON_VALUE "1" #define DEF_BUTTON_TRISTATE_VALUE "" #define DEF_BUTTON_OVER_RELIEF "" +#if TK_MAC_BUTTON_USE_COMPATIBILITY_METRICS #define DEF_BUTTON_PADX "12" +#define DEF_BUTTON_PADX_NOCM "1" +#else +#define DEF_BUTTON_PADX "1" +#endif #define DEF_LABCHKRAD_PADX "1" +#if TK_MAC_BUTTON_USE_COMPATIBILITY_METRICS #define DEF_BUTTON_PADY "3" +#define DEF_BUTTON_PADY_NOCM "1" +#else +#define DEF_BUTTON_PADY "1" +#endif #define DEF_LABCHKRAD_PADY "1" #define DEF_BUTTON_RELIEF "flat" #define DEF_LABCHKRAD_RELIEF "flat" @@ -342,12 +361,11 @@ #define DEF_MENUBUTTON_HIGHLIGHT BLACK #define DEF_MENUBUTTON_HIGHLIGHT_WIDTH "0" #define DEF_MENUBUTTON_IMAGE ((char *) NULL) -#define DEF_MENUBUTTON_INDICATOR "0" -/* #define DEF_MENUBUTTON_JUSTIFY "center" */ +#define DEF_MENUBUTTON_INDICATOR "1" #define DEF_MENUBUTTON_JUSTIFY "left" #define DEF_MENUBUTTON_MENU "" -#define DEF_MENUBUTTON_PADX "4p" -#define DEF_MENUBUTTON_PADY "3p" +#define DEF_MENUBUTTON_PADX "4" +#define DEF_MENUBUTTON_PADY "3" #define DEF_MENUBUTTON_RELIEF "flat" #define DEF_MENUBUTTON_STATE "normal" #define DEF_MENUBUTTON_TAKE_FOCUS "0" |