summaryrefslogtreecommitdiffstats
path: root/macosx/tkMacOSXFont.c
diff options
context:
space:
mode:
Diffstat (limited to 'macosx/tkMacOSXFont.c')
-rw-r--r--macosx/tkMacOSXFont.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/macosx/tkMacOSXFont.c b/macosx/tkMacOSXFont.c
index 30a3665..f6075d1 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.33 2007/11/11 21:41:12 cc_benny Exp $
+ * RCS: @(#) $Id: tkMacOSXFont.c,v 1.34 2007/11/13 06:47:21 das 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;
}
}
}