summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2017-05-01 10:07:45 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2017-05-01 10:07:45 (GMT)
commite9ec63eb161e3fdd44ab6ac9cd17c31747b2cf32 (patch)
tree3449360f380cbdb2c873b24a6d09a9e42e333fb4
parent198c6f071b0668cdccd52ddf642bea2607f265c7 (diff)
downloadtk-e9ec63eb161e3fdd44ab6ac9cd17c31747b2cf32.zip
tk-e9ec63eb161e3fdd44ab6ac9cd17c31747b2cf32.tar.gz
tk-e9ec63eb161e3fdd44ab6ac9cd17c31747b2cf32.tar.bz2
various end-of-line spaces
-rw-r--r--macosx/tkMacOSXDialog.c8
-rw-r--r--macosx/tkMacOSXScrlbr.c4
-rw-r--r--tests/imgPhoto.test44
-rw-r--r--xlib/xcolors.c4
4 files changed, 30 insertions, 30 deletions
diff --git a/macosx/tkMacOSXDialog.c b/macosx/tkMacOSXDialog.c
index 990cfb1..cd289d2 100644
--- a/macosx/tkMacOSXDialog.c
+++ b/macosx/tkMacOSXDialog.c
@@ -517,7 +517,7 @@ Tk_GetOpenFileObjCmd(
}
}
}
-
+
/*Accessory view for file filtering. Adapted from http://codefromabove.com/2015/01/nssavepanel-adding-an-accessory-view/ */
NSView *accessoryView = [[NSView alloc] initWithFrame:NSMakeRect(0.0, 0.0, 200, 32.0)];
NSTextField *label = [[NSTextField alloc] initWithFrame:NSMakeRect(0, 0, 60, 22)];
@@ -526,15 +526,15 @@ Tk_GetOpenFileObjCmd(
[label setBordered:NO];
[label setBezeled:NO];
[label setDrawsBackground:NO];
-
+
NSPopUpButton *popupButton = [[NSPopUpButton alloc] initWithFrame:NSMakeRect(50.0, 2, 140, 22.0) pullsDown:NO];
[popupButton addItemsWithTitles:openFileTypes];
[popupButton setAction:@selector(selectFormat:)];
-
+
[accessoryView addSubview:label];
[accessoryView addSubview:popupButton];
[openpanel setAllowedFileTypes:openFileTypes];
-
+
[openpanel setAccessoryView:accessoryView];
if (cmdObj) {
callbackInfo = ckalloc(sizeof(FilePanelCallbackInfo));
diff --git a/macosx/tkMacOSXScrlbr.c b/macosx/tkMacOSXScrlbr.c
index 6253fff..49ba999 100644
--- a/macosx/tkMacOSXScrlbr.c
+++ b/macosx/tkMacOSXScrlbr.c
@@ -285,8 +285,8 @@ TkpComputeScrollbarGeometry(
}
-
-
+
+
/*
*----------------------------------------------------------------------
diff --git a/tests/imgPhoto.test b/tests/imgPhoto.test
index e93dab4..f9ffa94 100644
--- a/tests/imgPhoto.test
+++ b/tests/imgPhoto.test
@@ -134,7 +134,7 @@ test imgPhoto-2.2 {ImgPhotoCreate procedure} -setup {
# } {couldn't open "bogus.img": no such file or directory}
test imgPhoto-3.1 {ImgPhotoConfigureMaster procedure} -constraints {
- hasTeapotPhoto
+ hasTeapotPhoto
} -body {
image create photo photo1 -file $teapotPhotoFile
photo1 configure -file $teapotPhotoFile
@@ -142,7 +142,7 @@ test imgPhoto-3.1 {ImgPhotoConfigureMaster procedure} -constraints {
image delete photo1
} -result {}
test imgPhoto-3.2 {ImgPhotoConfigureMaster procedure} -constraints {
- hasTeapotPhoto
+ hasTeapotPhoto
} -body {
image create photo photo1 -file $teapotPhotoFile
list [catch {photo1 configure -file bogus} err] [string tolower $err] \
@@ -151,7 +151,7 @@ test imgPhoto-3.2 {ImgPhotoConfigureMaster procedure} -constraints {
image delete photo1
} -result {1 {couldn't open "bogus": no such file or directory} 256 256}
test imgPhoto-3.3 {ImgPhotoConfigureMaster procedure} -constraints {
- hasTeapotPhoto
+ hasTeapotPhoto
} -setup {
destroy .c
pack [canvas .c]
@@ -235,7 +235,7 @@ test imgPhoto-4.9 {ImgPhotoCmd procedure: configure option} -setup {
image delete photo1
} -returnCodes error -result {value for "-gamma" missing}
test imgPhoto-4.10 {ImgPhotoCmd procedure: copy option} -constraints {
- hasTeapotPhoto
+ hasTeapotPhoto
} -setup {
image create photo photo1
image create photo photo2 -width 25 -height 30
@@ -278,7 +278,7 @@ test imgPhoto-4.14 {ImgPhotoCmd procedure: copy option} -setup {
image delete photo1 photo2
} -result {the "-from" option requires one to four integer values}
test imgPhoto-4.15 {ImgPhotoCmd procedure: copy option} -constraints {
- hasTeapotPhoto
+ hasTeapotPhoto
} -setup {
image create photo photo1
image create photo photo2 -file $teapotPhotoFile
@@ -290,7 +290,7 @@ test imgPhoto-4.15 {ImgPhotoCmd procedure: copy option} -constraints {
image delete photo1 photo2
} -result {60 50 {215 154 120}}
test imgPhoto-4.16 {ImgPhotoCmd procedure: copy option} -constraints {
- hasTeapotPhoto
+ hasTeapotPhoto
} -setup {
image create photo photo1
image create photo photo2 -file $teapotPhotoFile
@@ -301,7 +301,7 @@ test imgPhoto-4.16 {ImgPhotoCmd procedure: copy option} -constraints {
image delete photo1 photo2
} -result {80 100 {19 92 192}}
test imgPhoto-4.17 {ImgPhotoCmd procedure: copy option} -constraints {
- hasTeapotPhoto
+ hasTeapotPhoto
} -setup {
image create photo photo1
image create photo photo2 -file $teapotPhotoFile
@@ -312,7 +312,7 @@ test imgPhoto-4.17 {ImgPhotoCmd procedure: copy option} -constraints {
image delete photo1 photo2
} -result {100 100 {215 154 120}}
test imgPhoto-4.18 {ImgPhotoCmd procedure: copy option} -constraints {
- hasTeapotPhoto
+ hasTeapotPhoto
} -setup {
image create photo photo1
image create photo photo2 -file $teapotPhotoFile
@@ -334,7 +334,7 @@ test imgPhoto-4.19 {ImgPhotoCmd procedure: copy option} -constraints {
image delete photo1 photo2
} -result {120 100 {169 99 47}}
test imgPhoto-4.20 {ImgPhotoCmd procedure: copy option} -constraints {
- hasTeapotPhoto
+ hasTeapotPhoto
} -setup {
image create photo photo1
image create photo photo2 -file $teapotPhotoFile
@@ -345,7 +345,7 @@ test imgPhoto-4.20 {ImgPhotoCmd procedure: copy option} -constraints {
image delete photo1 photo2
} -result {90 80 {207 146 112}}
test imgPhoto-4.21 {ImgPhotoCmd procedure: copy option} -constraints {
- hasTeapotPhoto
+ hasTeapotPhoto
} -setup {
image create photo photo1
image create photo photo2 -file $teapotPhotoFile
@@ -368,7 +368,7 @@ test imgPhoto-4.21 {ImgPhotoCmd procedure: copy option} -constraints {
image delete photo1 photo2
} -result {256 256 49 51 49 51 49 51 10 51 10 10}
test imgPhoto-4.22 {ImgPhotoCmd procedure: get option} -constraints {
- hasTeapotPhoto
+ hasTeapotPhoto
} -setup {
image create photo photo1
} -body {
@@ -435,7 +435,7 @@ test imgPhoto-4.30 {ImgPhotoCmd procedure: read option} -setup {
image delete photo1
} -result {wrong # args: should be "photo1 read fileName ?-option value ...?"}
test imgPhoto-4.31 {ImgPhotoCmd procedure: read option} -constraints {
- hasTeapotPhoto
+ hasTeapotPhoto
} -setup {
image create photo photo1
} -body {
@@ -451,7 +451,7 @@ test imgPhoto-4.32 {ImgPhotoCmd procedure: read option} -setup {
image delete photo1
} -result {1 {couldn't open "bogus": no such file or directory}}
test imgPhoto-4.33 {ImgPhotoCmd procedure: read option} -constraints {
- hasTeapotPhoto
+ hasTeapotPhoto
} -setup {
image create photo photo1
} -body {
@@ -467,7 +467,7 @@ test imgPhoto-4.34 {ImgPhotoCmd procedure: read option} -setup {
image delete photo1
} -result [subst {couldn't recognize data in image file "$README"}]
test imgPhoto-4.35 {ImgPhotoCmd procedure: read option} -constraints {
- hasTeapotPhoto
+ hasTeapotPhoto
} -setup {
image create photo photo1
} -body {
@@ -477,7 +477,7 @@ test imgPhoto-4.35 {ImgPhotoCmd procedure: read option} -constraints {
image delete photo1
} -result {256 256 {161 109 82}}
test imgPhoto-4.36 {ImgPhotoCmd procedure: read option} -constraints {
- hasTeapotPhoto
+ hasTeapotPhoto
} -setup {
image create photo photo1
} -body {
@@ -805,7 +805,7 @@ test imgPhoto-4.74 {ImgPhotoCmd procedure: put option error handling} -setup {
image delete photo1
} -returnCodes 1 -result {wrong # args: should be "photo1 put data ?-option value ...?"}
test imgPhoto-4.75 {<photo> read command: filename starting with '-'} -constraints {
- hasTeapotPhoto
+ hasTeapotPhoto
} -body {
file copy -force $teapotPhotoFile -teapotPhotoFile
image create photo photo1
@@ -816,7 +816,7 @@ test imgPhoto-4.75 {<photo> read command: filename starting with '-'} -constrain
} -result {}
test imgPhoto-5.1 {ImgPhotoGet/Free procedures, shared instances} -constraints {
- hasTeapotPhoto
+ hasTeapotPhoto
} -setup {
destroy .c
pack [canvas .c]
@@ -853,7 +853,7 @@ test imgPhoto-6.1 {ImgPhotoDisplay procedure, blank display} -setup {
} -result {}
test imgPhoto-7.1 {ImgPhotoFree procedure, resource freeing} -constraints {
- hasTeapotPhoto
+ hasTeapotPhoto
} -setup {
destroy .c
pack [canvas .c]
@@ -868,7 +868,7 @@ test imgPhoto-7.1 {ImgPhotoFree procedure, resource freeing} -constraints {
destroy .c
} -result {}
test imgPhoto-7.2 {ImgPhotoFree procedures, unlinking} -constraints {
- hasTeapotPhoto
+ hasTeapotPhoto
} -setup {
deleteWindows
imageCleanup
@@ -893,7 +893,7 @@ test imgPhoto-7.2 {ImgPhotoFree procedures, unlinking} -constraints {
image delete photo1
} -result {}
test imgPhoto-7.3 {ImgPhotoFree procedures, multiple visuals} -constraints {
- hasTeapotPhoto
+ hasTeapotPhoto
} -setup {
deleteWindows
imageCleanup
@@ -918,7 +918,7 @@ test imgPhoto-8.1 {ImgPhotoDelete procedure} -constraints hasTeapotPhoto -body {
image delete photo2
} -result {}
test imgPhoto-8.2 {ImgPhotoDelete procedure} -constraints {
- hasTeapotPhoto
+ hasTeapotPhoto
} -setup {
set x {}
} -body {
@@ -938,7 +938,7 @@ test imgPhoto-8.3 {ImgPhotoDelete procedure, name cleanup} -body {
} -result {image "photo2" doesn't exist or is not a photo image}
test imgPhoto-9.1 {ImgPhotoCmdDeletedProc procedure} -constraints {
- hasTeapotPhoto
+ hasTeapotPhoto
} -body {
image create photo photo2 -file $teapotPhotoFile
rename photo2 {}
diff --git a/xlib/xcolors.c b/xlib/xcolors.c
index 36dc67c..78fd44b 100644
--- a/xlib/xcolors.c
+++ b/xlib/xcolors.c
@@ -350,11 +350,11 @@ XParseColor(
* digits in the spec. Ergo, it is not a vailid color string.
* (Bug f0188aca9e)
*/
-
+
if (*p != '\0') {
return 0;
}
-
+
switch ((int)(p-spec)) {
case 3:
colorPtr->red = US(((value >> 8) & 0xf) * 0x1111);