summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog2
-rw-r--r--generic/tkEvent.c2
-rw-r--r--generic/tkFont.c2
-rw-r--r--generic/tkTextBTree.c2
-rw-r--r--generic/tkUndo.c2
-rw-r--r--macosx/tkMacOSXButton.c6
-rw-r--r--macosx/tkMacOSXDialog.c2
-rw-r--r--macosx/tkMacOSXDraw.c28
-rw-r--r--macosx/tkMacOSXEmbed.c2
-rw-r--r--macosx/tkMacOSXInit.c2
-rw-r--r--macosx/tkMacOSXMenu.c4
-rw-r--r--macosx/tkMacOSXPrivate.h2
-rw-r--r--macosx/tkMacOSXScrlbr.c6
-rw-r--r--macosx/tkMacOSXWindowEvent.c14
-rw-r--r--win/tkWinTest.c2
15 files changed, 39 insertions, 39 deletions
diff --git a/ChangeLog b/ChangeLog
index 7eb5433..0527b19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,7 +33,7 @@ a better first place to look now.
* library/ttk/progress.tcl: Bug [c597acdab3]: Call [$pb step]
in tail position in ttk::progressbar::Autoincrement, so that
the widget is in a consistent state when any write traces on
- the linked -variable are fired.
+ the linked -variable are fired.
2013-08-14 Jan Nijtmans <nijtmans@users.sf.net>
diff --git a/generic/tkEvent.c b/generic/tkEvent.c
index 51eca3a..bcc6d98 100644
--- a/generic/tkEvent.c
+++ b/generic/tkEvent.c
@@ -356,7 +356,7 @@ CreateXIC(
/* XCreateIC failed. */
return;
}
-
+
/*
* Adjust the window's event mask if the IM requires it.
*/
diff --git a/generic/tkFont.c b/generic/tkFont.c
index a955c35..4211d99 100644
--- a/generic/tkFont.c
+++ b/generic/tkFont.c
@@ -633,7 +633,7 @@ Tk_FontObjCmd(
return result;
}
return GetAttributeInfoObj(interp, &nfPtr->fa, objPtr);
- }
+ }
case FONT_CREATE: {
int skip = 3, i;
const char *name;
diff --git a/generic/tkTextBTree.c b/generic/tkTextBTree.c
index e34dae7..a06d7e9 100644
--- a/generic/tkTextBTree.c
+++ b/generic/tkTextBTree.c
@@ -1989,7 +1989,7 @@ TkBTreeLinesTo(
}
}
if (textPtr != NULL) {
- /*
+ /*
* The index to return must be relative to textPtr, not to the entire
* tree. Take care to never return a negative index when linePtr
* denotes a line before -startline, or an index larger than the
diff --git a/generic/tkUndo.c b/generic/tkUndo.c
index a642e72..8359e0a 100644
--- a/generic/tkUndo.c
+++ b/generic/tkUndo.c
@@ -392,7 +392,7 @@ TkUndoSetDepth(
prevelem = elem;
elem = elem->next;
}
- CLANG_ASSERT(prevelem);
+ CLANG_ASSERT(prevelem);
prevelem->next = NULL;
while (elem != NULL) {
prevelem = elem;
diff --git a/macosx/tkMacOSXButton.c b/macosx/tkMacOSXButton.c
index d4aae8d..720e40d 100644
--- a/macosx/tkMacOSXButton.c
+++ b/macosx/tkMacOSXButton.c
@@ -52,9 +52,9 @@ static NSRect TkMacOSXGetButtonFrame(TkButton *butPtr);
NSRect Tkframe = TkMacOSXGetButtonFrame(butPtr);
Tk_Window tkwin = butPtr->tkwin;
/* 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;
}
@@ -71,7 +71,7 @@ static NSRect TkMacOSXGetButtonFrame(TkButton *butPtr);
int parent_width = Tk_Width(Tk_Parent(tkwin));
int widget_width = Tk_Width(tkwin);
int x = Tk_X(tkwin);
- if (x > parent_width - 50 || x < 0) {
+ if (x > parent_width - 50 || x < 0) {
return;
}
}
diff --git a/macosx/tkMacOSXDialog.c b/macosx/tkMacOSXDialog.c
index 2f77203..a66939a 100644
--- a/macosx/tkMacOSXDialog.c
+++ b/macosx/tkMacOSXDialog.c
@@ -1,4 +1,4 @@
-/*
+/*
* tkMacOSXDialog.c --
*
* Contains the Mac implementation of the common dialog boxes.
diff --git a/macosx/tkMacOSXDraw.c b/macosx/tkMacOSXDraw.c
index 0f8e051..537b2e2 100644
--- a/macosx/tkMacOSXDraw.c
+++ b/macosx/tkMacOSXDraw.c
@@ -1480,19 +1480,19 @@ TkScrollWindow(
TkRegion damageRgn) /* Region to accumulate damage in. */
{
Drawable drawable = Tk_WindowId(tkwin);
- MacDrawable *macDraw = (MacDrawable *) drawable;
+ MacDrawable *macDraw = (MacDrawable *) drawable;
NSView *view = TkMacOSXDrawableView(macDraw);
CGRect srcRect, dstRect;
HIShapeRef dmgRgn = NULL, extraRgn;
NSRect bounds, visRect, scrollSrc, scrollDst;
NSPoint delta = NSMakePoint(dx, dy);
int result;
-
+
if ( view ) {
/* Get the scroll area in NSView coordinates (origin at bottom left). */
bounds = [view bounds];
scrollSrc = NSMakeRect(
- macDraw->xOff + x,
+ macDraw->xOff + x,
bounds.size.height - height - (macDraw->yOff + y),
width, height);
scrollDst = NSOffsetRect(scrollSrc, dx, -dy);
@@ -1500,45 +1500,45 @@ TkScrollWindow(
visRect = [view visibleRect];
scrollSrc = NSIntersectionRect(scrollSrc, visRect);
scrollDst = NSIntersectionRect(scrollDst, visRect);
-
+
if ( !NSIsEmptyRect(scrollSrc) && !NSIsEmptyRect(scrollDst) ) {
-
+
/*
* Mark the difference between source and destination as damaged.
* This region is described in the Tk coordinate system.
*/
-
+
srcRect = CGRectMake(x, y, width, height);
dstRect = CGRectOffset(srcRect, dx, dy);
dmgRgn = HIShapeCreateMutableWithRect(&srcRect);
extraRgn = HIShapeCreateWithRect(&dstRect);
ChkErr(HIShapeDifference, dmgRgn, extraRgn, (HIMutableShapeRef) dmgRgn);
CFRelease(extraRgn);
-
+
/* Scroll the rectangle. */
[view scrollRect:scrollSrc by:NSMakeSize(dx, -dy)];
-
- /*
+
+ /*
* Adjust the positions of the button subwindows that meet the scroll
* area.
*/
-
+
for (NSView *subview in [view subviews] ) {
if ( [subview isKindOfClass:[NSButton class]] == YES ) {
NSRect subframe = [subview frame];
if ( NSIntersectsRect(scrollSrc, subframe) ||
- NSIntersectsRect(scrollDst, subframe) ) {
+ NSIntersectsRect(scrollDst, subframe) ) {
TkpShiftButton((NSButton *)subview, delta );
}
}
}
-
+
/* Redisplay the scrolled area. */
[view displayRect:scrollDst];
-
+
}
}
-
+
if ( dmgRgn == NULL ) {
dmgRgn = HIShapeCreateEmpty();
}
diff --git a/macosx/tkMacOSXEmbed.c b/macosx/tkMacOSXEmbed.c
index 41a1e1b..1d66b82 100644
--- a/macosx/tkMacOSXEmbed.c
+++ b/macosx/tkMacOSXEmbed.c
@@ -14,7 +14,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*/
-
+
#include "tkMacOSXPrivate.h"
#include "tkBusy.h"
diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c
index 00df93e..a807dfa 100644
--- a/macosx/tkMacOSXInit.c
+++ b/macosx/tkMacOSXInit.c
@@ -243,7 +243,7 @@ TkpInit(
Tcl_Panic("Mac OS X 10.%d or later required !",
(MAC_OS_X_VERSION_MIN_REQUIRED/10)-100);
}
-
+
#ifdef TK_FRAMEWORK
/*
diff --git a/macosx/tkMacOSXMenu.c b/macosx/tkMacOSXMenu.c
index a8e9f2f..85e1d6c 100644
--- a/macosx/tkMacOSXMenu.c
+++ b/macosx/tkMacOSXMenu.c
@@ -757,7 +757,7 @@ TkpPostMenu(
* to be posted. */
int y) /* The global y-coordinate */
{
-
+
/* Get the object that holds this Tk Window.*/
Tk_Window root;
@@ -765,7 +765,7 @@ TkpPostMenu(
if (root == NULL) {
return TCL_ERROR;
}
-
+
Drawable d = Tk_WindowId(root);
NSView *rootview = TkMacOSXGetRootControl(d);
NSWindow *win = [rootview window];
diff --git a/macosx/tkMacOSXPrivate.h b/macosx/tkMacOSXPrivate.h
index 1aee7f4..adc7106 100644
--- a/macosx/tkMacOSXPrivate.h
+++ b/macosx/tkMacOSXPrivate.h
@@ -1,5 +1,5 @@
/*
- * tkMacOSXPrivate.h --
+ * tkMacOSXPrivate.h --
*
* Macros and declarations that are purely internal & private to TkAqua.
*
diff --git a/macosx/tkMacOSXScrlbr.c b/macosx/tkMacOSXScrlbr.c
index f9a2f5f..405558b 100644
--- a/macosx/tkMacOSXScrlbr.c
+++ b/macosx/tkMacOSXScrlbr.c
@@ -1,5 +1,5 @@
/*
- * tkMacOSXScrollbar.c --
+ * tkMacOSXScrollbar.c --
*
* This file implements the Macintosh specific portion of the scrollbar
* widget.
@@ -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 b257caa..5d50278 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*/
-
+
#include "tkMacOSXPrivate.h"
#include "tkMacOSXWm.h"
#include "tkMacOSXEvent.h"
@@ -388,7 +388,7 @@ GenerateUpdates(
/*
* TODO: Here we should handle out of process embedding.
*/
- }
+ }
return 1;
}
@@ -785,7 +785,7 @@ double drawTime;
/*
* Set a minimum time for drawing to render. With removal of private NSView API's, default drawing
* is slower and less responsive. This number, which seems feasible after some experimentatation, skips
- * some drawing to avoid lag.
+ * some drawing to avoid lag.
*/
#define MAX_DYNAMIC_TIME .000000001
@@ -854,7 +854,7 @@ ExposeRestrictProc(
-(void) viewWillDraw {
[self setNeedsDisplay:YES];
- }
+ }
- (void) generateExposeEvents: (HIMutableShapeRef) shape
{
@@ -889,12 +889,12 @@ ExposeRestrictProc(
UINT2PTR(serial), &oldArg);
while (Tcl_ServiceEvent(TCL_WINDOW_EVENTS)) {}
-
+
Tk_RestrictEvents(oldProc, oldArg, &oldArg);
while (Tcl_DoOneEvent(TCL_IDLE_EVENTS|TCL_DONT_WAIT)) {}
- }
-
+ }
+
}
/*This is no-op on 10.7 and up because Apple has removed this widget, but leaving here for backwards compatibility.*/
diff --git a/win/tkWinTest.c b/win/tkWinTest.c
index 8a92f5a..d824ee4 100644
--- a/win/tkWinTest.c
+++ b/win/tkWinTest.c
@@ -82,7 +82,7 @@ TkplatformtestInit(
struct TestFindControlState {
int id;
HWND control;
-};
+};
/* Callback for window enumeration - used for TestFindControl */
BOOL CALLBACK TestFindControlCallback(
generated by cgit v0.12 at 2024-11-25 22:34:01 (GMT)