summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--library/ttk/fonts.tcl4
-rw-r--r--macosx/tkMacOSXFont.c5
3 files changed, 7 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index e6a284c..1780348 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2007-10-29 Jeff Hobbs <jeffh@ActiveState.com>
+ * macosx/tkMacOSXFont.c (InitSystemFonts):
+ * library/ttk/fonts.tcl: use Monaco 11 (was 9) as Aqua TkFixedFont
+
* tests/listbox.test, tests/panedwindow.test, tests/scrollbar.test:
* library/bgerror.tcl, library/dialog.tcl, library/listbox.tcl:
* library/msgbox.tcl, library/optMenu.tcl, library/tclIndex:
diff --git a/library/ttk/fonts.tcl b/library/ttk/fonts.tcl
index f99aaf3..2d4b58f 100644
--- a/library/ttk/fonts.tcl
+++ b/library/ttk/fonts.tcl
@@ -1,5 +1,5 @@
#
-# $Id: fonts.tcl,v 1.8 2007/10/30 01:57:55 hobbs Exp $
+# $Id: fonts.tcl,v 1.9 2007/10/30 02:33:09 hobbs Exp $
#
# Font specifications.
#
@@ -111,7 +111,7 @@ switch -- [tk windowingsystem] {
set F(viewsize) 12
set F(smallsize) 11
set F(labelsize) 10
- set F(fixedsize) 9
+ set F(fixedsize) 11
font configure TkDefaultFont -family $F(family) -size $F(size)
font configure TkTextFont -family $F(family) -size $F(size)
diff --git a/macosx/tkMacOSXFont.c b/macosx/tkMacOSXFont.c
index 85f5008..e1f609b 100644
--- a/macosx/tkMacOSXFont.c
+++ b/macosx/tkMacOSXFont.c
@@ -35,7 +35,7 @@
* that such fonts can not be used for controls, because controls
* definitely require a family id (this assertion needs testing).
*
- * RCS: @(#) $Id: tkMacOSXFont.c,v 1.30 2007/10/21 14:50:54 das Exp $
+ * RCS: @(#) $Id: tkMacOSXFont.c,v 1.31 2007/10/30 02:33:10 hobbs Exp $
*/
#include "tkMacOSXPrivate.h"
@@ -348,12 +348,11 @@ InitSystemFonts(
systemFont++;
}
fa.family = Tk_GetUid("monaco");
- fa.size = 9;
+ fa.size = 11;
fa.weight = TK_FW_NORMAL;
fa.slant = TK_FS_ROMAN;
fa.underline = 0;
CreateNamedSystemFont(interp, tkwin, "TkFixedFont", &fa);
-
}
/*