summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2015-03-16 14:13:17 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2015-03-16 14:13:17 (GMT)
commitc9882c7aeaae398fd75018012a712567852fd788 (patch)
tree4e9f3b4391626ebe9e64a4e1df746ae347bdfaf2
parent6d849d232afb87840ffe3c1f9055e400e0907a63 (diff)
parent9df910230823bd6be37562f8f344258c54add11f (diff)
downloadtk-c9882c7aeaae398fd75018012a712567852fd788.zip
tk-c9882c7aeaae398fd75018012a712567852fd788.tar.gz
tk-c9882c7aeaae398fd75018012a712567852fd788.tar.bz2
Merge-mark, and remove some unnecessary end-of-line spacing.
-rw-r--r--generic/tkText.c2
-rw-r--r--generic/tkTextDisp.c4
-rw-r--r--macosx/tkMacOSXButton.c10
-rw-r--r--macosx/tkMacOSXScrlbr.c2
-rw-r--r--macosx/tkMacOSXWindowEvent.c2
-rw-r--r--macosx/tkMacOSXWm.c2
6 files changed, 11 insertions, 11 deletions
diff --git a/generic/tkText.c b/generic/tkText.c
index 0d06233..c0d0dc2 100644
--- a/generic/tkText.c
+++ b/generic/tkText.c
@@ -931,7 +931,7 @@ TextWidgetObjCmd(
/*
* Now we need to adjust the count to:
- * - subtract off the number of display lines between
+ * - subtract off the number of display lines between
* indexToPtr and index2, since we might have skipped past
* indexToPtr, if we have several logical lines in a
* single display line
diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c
index 01ec22d..95ea935 100644
--- a/generic/tkTextDisp.c
+++ b/generic/tkTextDisp.c
@@ -7029,7 +7029,7 @@ TkTextIndexBbox(
dlPtr = FindDLine(textPtr, dInfoPtr->dLinePtr, indexPtr);
- /*
+ /*
* Two cases shall be trapped here because the logic later really
* needs dlPtr to be the display line containing indexPtr:
* 1. if no display line contains the desired index (NULL dlPtr)
@@ -7173,7 +7173,7 @@ TkTextDLineInfo(
dlPtr = FindDLine(textPtr, dInfoPtr->dLinePtr, indexPtr);
- /*
+ /*
* Two cases shall be trapped here because the logic later really
* needs dlPtr to be the display line containing indexPtr:
* 1. if no display line contains the desired index (NULL dlPtr)
diff --git a/macosx/tkMacOSXButton.c b/macosx/tkMacOSXButton.c
index 5c5aa9e..725c211 100644
--- a/macosx/tkMacOSXButton.c
+++ b/macosx/tkMacOSXButton.c
@@ -387,7 +387,7 @@ TkpComputeButtonGeometry(
butPtr->inset = 0;
butPtr->inset += butPtr->highlightWidth;
-
+
if (TkMacOSXComputeButtonDrawParams(butPtr,&drawParams)) {
HIRect tmpRect;
HIRect contBounds;
@@ -519,7 +519,7 @@ DrawButtonImageAndText(
/*
* Image is left or right of text
*/
-
+
if (butPtr->compound == COMPOUND_LEFT) {
textXOffset = width + butPtr->padX;
} else {
@@ -536,7 +536,7 @@ DrawButtonImageAndText(
/*
* Image and text are superimposed
*/
-
+
fullWidth = (width > butPtr->textWidth ? width :
butPtr->textWidth);
fullHeight = (height > butPtr->textHeight ? height :
@@ -593,7 +593,7 @@ DrawButtonImageAndText(
imageXOffset, imageYOffset, 1);
XSetClipOrigin(butPtr->display, dpPtr->gc, 0, 0);
}
-
+
Tk_DrawTextLayout(butPtr->display, pixmap,
dpPtr->gc, butPtr->textLayout,
x + textXOffset, y + textYOffset, 0, -1);
@@ -618,7 +618,7 @@ DrawButtonImageAndText(
imageYOffset += y;
if (butPtr->image != NULL) {
-
+
if ((butPtr->selectImage != NULL) &&
(butPtr->flags & SELECTED)) {
Tk_RedrawImage(butPtr->selectImage, 0, 0, width,
diff --git a/macosx/tkMacOSXScrlbr.c b/macosx/tkMacOSXScrlbr.c
index 7370ff5..bdb76af 100644
--- a/macosx/tkMacOSXScrlbr.c
+++ b/macosx/tkMacOSXScrlbr.c
@@ -437,7 +437,7 @@ UpdateControlValues(
MacDrawable *macWin = (MacDrawable *) Tk_WindowId(scrollPtr->tkwin);
double dViewSize;
HIRect contrlRect;
- int variant;
+ int variant;
short width, height;
NSView *view = TkMacOSXDrawableView(macWin);
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index 3e2a437..241da83 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -763,7 +763,7 @@ Tk_MacOSXIsAppInFront(void)
/*
* Custom content view for use in Tk NSWindows.
- *
+ *
* Since Tk handles all drawing of widgets, we only use the AppKit event loop
* as a source of input events. To do this, we overload the NSView drawRect
* method with a method which generates Expose events for Tk but does no
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index d81e8d6..429d7aa 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -5935,7 +5935,7 @@ TkpChangeFocus(
[win makeKeyAndOrderFront:NSApp];
}
}
-
+
/*
* Remember the current serial number for the X server and issue a dummy
* server request. This marks the position at which we changed the focus,