diff options
| author | dgp <dgp@users.sourceforge.net> | 2007-11-13 13:08:44 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2007-11-13 13:08:44 (GMT) |
| commit | 8e00a1fe132443393325a8f4bc1c6c1709300526 (patch) | |
| tree | 70d2e99b587f0f207d28c373ec2e05962f69ba75 | |
| parent | ee7e7bafbc3b4a75acd87dab966877649e6929f5 (diff) | |
| download | tk-8e00a1fe132443393325a8f4bc1c6c1709300526.zip tk-8e00a1fe132443393325a8f4bc1c6c1709300526.tar.gz tk-8e00a1fe132443393325a8f4bc1c6c1709300526.tar.bz2 | |
merge updates from HEAD
| -rw-r--r-- | macosx/tkMacOSXFont.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/macosx/tkMacOSXFont.c b/macosx/tkMacOSXFont.c index 18b44a5..d78670e 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.24.2.8 2007/11/12 19:22:39 dgp Exp $ + * RCS: @(#) $Id: tkMacOSXFont.c,v 1.24.2.9 2007/11/13 13:08:44 dgp Exp $ */ #include "tkMacOSXPrivate.h" @@ -321,7 +321,7 @@ InitSystemFonts( /* force this for now */ if (!mainPtr->winPtr->mainPtr) { - mainPtr->winPtr->mainPtr = mainPtr; + mainPtr->winPtr->mainPtr = mainPtr; } TkInitFontAttributes(&fa); while (systemFont->systemName) { @@ -928,8 +928,7 @@ TkpMeasureCharsInContext( * also something we like to decide for ourself. */ - while ((offset > urstart) && - (uchars[offset-1] == ' ')) { + while ((offset > urstart) && (uchars[offset-1] == ' ')) { offset--; } } @@ -940,7 +939,7 @@ TkpMeasureCharsInContext( if (flags & TK_WHOLE_WORDS) { if ((flags & TK_AT_LEAST_ONE) - && ((offset == urstart) || (uchars[offset] != ' '))) { + && ((offset == urstart) || (uchars[offset] != ' '))) { /* * With TK_AT_LEAST_ONE, if we are the the start of the * range, we need to add at least one character. If we are @@ -951,17 +950,17 @@ TkpMeasureCharsInContext( * code for character mode below. */ - forceCharacterMode = 1; + forceCharacterMode = 1; - } else { + } else { /* * If we are not at the end of a word, we must be in the * middle of the first word still. Return 0. */ if ((offset != urend) && (uchars[offset] != ' ')) { - offset = urstart; - curX = 0; + offset = urstart; + curX = 0; } } } |