summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2015-01-15 16:06:18 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2015-01-15 16:06:18 (GMT)
commit82a83e55c5f93ae3e6545f829f98c828fefa3c5b (patch)
treeaff9b47194677ca3fe501b1d9d1f88f5a9236455
parent03734119e407f4bcced1a69bb30f1032fb83b222 (diff)
downloadtk-82a83e55c5f93ae3e6545f829f98c828fefa3c5b.zip
tk-82a83e55c5f93ae3e6545f829f98c828fefa3c5b.tar.gz
tk-82a83e55c5f93ae3e6545f829f98c828fefa3c5b.tar.bz2
remove some unnecessary eol-spacing
-rw-r--r--generic/tkTextDisp.c4
-rw-r--r--macosx/tkMacOSXButton.c2
-rw-r--r--macosx/tkMacOSXDraw.c2
-rw-r--r--macosx/tkMacOSXMenubutton.c2
-rw-r--r--macosx/tkMacOSXScrlbr.c4
-rw-r--r--macosx/tkMacOSXWindowEvent.c8
-rw-r--r--tests/bugs.tcl2
-rw-r--r--tests/butGeom2.tcl2
-rw-r--r--tests/canvPsGrph.tcl6
-rw-r--r--tests/canvPsImg.tcl2
-rw-r--r--tests/constraints.tcl6
11 files changed, 20 insertions, 20 deletions
diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c
index 4391f0c..7422fd1 100644
--- a/generic/tkTextDisp.c
+++ b/generic/tkTextDisp.c
@@ -3895,7 +3895,7 @@ RedisplayText(
TkRegion damageRegion = TkCreateRegion();
XRectangle rectangle = {0, 0, dInfoPtr->maxX, dInfoPtr->maxY};
TkUnionRectWithRegion(&rectangle, damageRegion, damageRegion);
-
+
TextInvalidateRegion(textPtr, damageRegion);
DisplayText(clientData);
}
@@ -3915,7 +3915,7 @@ DisplayText(
* warnings. */
Tcl_Interp *interp;
#ifdef MAC_OSX_TK
- Tcl_TimerToken macRefreshTimer = NULL;
+ Tcl_TimerToken macRefreshTimer = NULL;
#endif
if ((textPtr->tkwin == NULL) || (textPtr->flags & DESTROYED)) {
diff --git a/macosx/tkMacOSXButton.c b/macosx/tkMacOSXButton.c
index 80324cc..64a05d6 100644
--- a/macosx/tkMacOSXButton.c
+++ b/macosx/tkMacOSXButton.c
@@ -75,7 +75,7 @@ static NSRect TkMacOSXGetButtonFrame(TkButton *butPtr);
return;
}
}
-
+
[super drawRect:dirtyRect];
}
}
diff --git a/macosx/tkMacOSXDraw.c b/macosx/tkMacOSXDraw.c
index 07bfe81..6c0268c 100644
--- a/macosx/tkMacOSXDraw.c
+++ b/macosx/tkMacOSXDraw.c
@@ -1539,7 +1539,7 @@ TkScrollWindow(
[view displayRect:scrollDst];
[view setHidden:NO];
-
+
}
}
diff --git a/macosx/tkMacOSXMenubutton.c b/macosx/tkMacOSXMenubutton.c
index 02a7a38..df42763 100644
--- a/macosx/tkMacOSXMenubutton.c
+++ b/macosx/tkMacOSXMenubutton.c
@@ -15,7 +15,7 @@
#include "tkMacOSXPrivate.h"
#include "tkMenubutton.h"
#include "tkMacOSXFont.h"
-#include "tkMacOSXDebug.h"
+#include "tkMacOSXDebug.h"
/*
#ifdef TK_MAC_DEBUG
diff --git a/macosx/tkMacOSXScrlbr.c b/macosx/tkMacOSXScrlbr.c
index ebb99f3..405558b 100644
--- a/macosx/tkMacOSXScrlbr.c
+++ b/macosx/tkMacOSXScrlbr.c
@@ -49,9 +49,9 @@ NSRect TkMacOSXGetScrollFrame(TkScrollbar *scrlPtr);
Tk_Window tkwin = scrollPtr->tkwin;
NSRect Tkframe = TkMacOSXGetScrollFrame(scrollPtr);
/* Do not draw if the widget is misplaced or unmapped. */
- if ( NSIsEmptyRect(Tkframe) ||
+ if ( NSIsEmptyRect(Tkframe) ||
! macWin->winPtr->flags & TK_MAPPED ||
- ! NSEqualRects(Tkframe, [self frame])
+ ! NSEqualRects(Tkframe, [self frame])
) {
return;
}
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index 0e3ecf7..63df797 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -817,7 +817,7 @@ ExposeRestrictProc(
NSCompositeSourceOver);
#endif
-
+
CGFloat height = [self bounds].size.height;
HIMutableShapeRef drawShape = HIShapeCreateMutable();
@@ -835,9 +835,9 @@ ExposeRestrictProc(
NSEventTrackingRunLoopMode, NSModalPanelRunLoopMode,
nil]];
}
-
+
CFRelease(drawShape);
-
+
}
@@ -872,7 +872,7 @@ ExposeRestrictProc(
[self setNeedsDisplay:YES];
[super setNeedsDisplay:YES];
[super viewDidEndLiveResize];
-
+
}
/*Core function of this class, generates expose events for redrawing.*/
diff --git a/tests/bugs.tcl b/tests/bugs.tcl
index 83d9519..55e5f84 100644
--- a/tests/bugs.tcl
+++ b/tests/bugs.tcl
@@ -1,6 +1,6 @@
# This file is a Tcl script to test out various known bugs that will
# cause Tk to crash. This file ends with .tcl instead of .test to make
-# sure it isn't run when you type "source all". We currently are not
+# sure it isn't run when you type "source all". We currently are not
# shipping this file with the rest of the source release.
#
# Copyright (c) 1996 Sun Microsystems, Inc.
diff --git a/tests/butGeom2.tcl b/tests/butGeom2.tcl
index 96ff209..096225c 100644
--- a/tests/butGeom2.tcl
+++ b/tests/butGeom2.tcl
@@ -35,7 +35,7 @@ pack .t.anchorLabel .t.control.left.f -in .t.control.left -side top -anchor w
foreach opt {activebackground activeforeground background disabledforeground foreground highlightbackground highlightcolor } {
#button .t.color-$opt -text $opt -command "config -$opt \[tk_chooseColor]"
menubutton .t.color-$opt -text $opt -menu .t.color-$opt.m -indicatoron 1 \
- -relief raised -bd 2
+ -relief raised -bd 2
menu .t.color-$opt.m -tearoff 0
.t.color-$opt.m add command -label Red -command "config -$opt red"
.t.color-$opt.m add command -label Green -command "config -$opt green"
diff --git a/tests/canvPsGrph.tcl b/tests/canvPsGrph.tcl
index 343979f..08ccd74 100644
--- a/tests/canvPsGrph.tcl
+++ b/tests/canvPsGrph.tcl
@@ -50,13 +50,13 @@ proc mkObjs c {
$c create rect 380 200 420 240 -fill black
$c create rect 200 330 240 370 -fill black
}
-
+
if {$what == "oval"} {
$c create oval 50 10 150 80 -fill black -stipple gray25 -outline {}
$c create oval 100 100 200 150 -outline {} -fill black -stipple gray50
$c create oval 250 100 400 300 -width .5c
}
-
+
if {$what == "poly"} {
$c create poly 100 200 200 50 300 200 -smooth yes -stipple gray25 \
-outline black -width 4
@@ -68,7 +68,7 @@ proc mkObjs c {
$c create poly 20 200 100 220 90 100 40 250 \
-fill {} -outline brown -width 3
}
-
+
if {$what == "line"} {
$c create line 20 20 120 20 -arrow both -width 5
$c create line 20 80 150 80 20 200 150 200 -smooth yes
diff --git a/tests/canvPsImg.tcl b/tests/canvPsImg.tcl
index c06aeaa..1f46eca 100644
--- a/tests/canvPsImg.tcl
+++ b/tests/canvPsImg.tcl
@@ -35,7 +35,7 @@ toplevel .t
wm title .t "Postscript Tests for Canvases: Images"
wm iconname .t "Postscript"
-message .t.m -text {This screen exercises the Postscript-generation abilities of Tk canvas widgets for images. Click the buttons below to select a Visual type for the canvas and colormode for the Postscript output. Then click "Print" to send the results to the default printer, or "Print to file" to put the Postscript output in a file called "/tmp/test.ps". You can also click on items in the canvas to delete them.
+message .t.m -text {This screen exercises the Postscript-generation abilities of Tk canvas widgets for images. Click the buttons below to select a Visual type for the canvas and colormode for the Postscript output. Then click "Print" to send the results to the default printer, or "Print to file" to put the Postscript output in a file called "/tmp/test.ps". You can also click on items in the canvas to delete them.
NOTE: Some Postscript printers may not be able to handle Postscript generated in color mode.} -width 6i
pack .t.m -side top -fill both
diff --git a/tests/constraints.tcl b/tests/constraints.tcl
index 535d839..6402753 100644
--- a/tests/constraints.tcl
+++ b/tests/constraints.tcl
@@ -38,7 +38,7 @@ namespace eval tk {
}
namespace eval bg {
- # Manage a background process.
+ # Manage a background process.
# Replace with slave interp or thread?
namespace import ::tcltest::interpreter
namespace import ::tk::test::loadTkCommand
@@ -126,7 +126,7 @@ namespace eval tk {
eval destroy [winfo children .]
}
- namespace export fixfocus
+ namespace export fixfocus
proc fixfocus {} {
catch {destroy .focus}
toplevel .focus
@@ -185,7 +185,7 @@ testConstraint aqua [expr {[tk windowingsystem] eq "aqua"}]
testConstraint nonwin [expr {[tk windowingsystem] ne "win32"}]
testConstraint userInteraction 0
testConstraint nonUnixUserInteraction [expr {
- [testConstraint userInteraction] ||
+ [testConstraint userInteraction] ||
([testConstraint unix] && [testConstraint notAqua])
}]
testConstraint haveDISPLAY [info exists env(DISPLAY)]