diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-10-23 09:24:21 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-10-23 09:24:21 (GMT) |
commit | 27afd154a9fc5f72d7a829b285c340766ef8c6ce (patch) | |
tree | ef8e82bfe8e93cd5d05b724b1462d6981ea86454 /macosx | |
parent | 880cdb78d06b59af92473975f26308d56a266979 (diff) | |
parent | c5c29cc39d29340d28c498b3008ba0a9ca9f84bd (diff) | |
download | tk-27afd154a9fc5f72d7a829b285c340766ef8c6ce.zip tk-27afd154a9fc5f72d7a829b285c340766ef8c6ce.tar.gz tk-27afd154a9fc5f72d7a829b285c340766ef8c6ce.tar.bz2 |
consistant use of mode: objc for OSX, strip spaces from the end of lines
Diffstat (limited to 'macosx')
-rw-r--r-- | macosx/README | 20 | ||||
-rw-r--r-- | macosx/Wish.sdef | 2 | ||||
-rw-r--r-- | macosx/configure.ac | 2 | ||||
-rw-r--r-- | macosx/tkMacOSXCursor.c | 2 | ||||
-rw-r--r-- | macosx/tkMacOSXDebug.c | 2 | ||||
-rw-r--r-- | macosx/tkMacOSXDialog.c | 2 | ||||
-rw-r--r-- | macosx/tkMacOSXEmbed.c | 2 | ||||
-rw-r--r-- | macosx/tkMacOSXEntry.c | 2 | ||||
-rw-r--r-- | macosx/tkMacOSXInit.c | 2 | ||||
-rw-r--r-- | macosx/tkMacOSXRegion.c | 2 | ||||
-rw-r--r-- | macosx/tkMacOSXScale.c | 2 | ||||
-rw-r--r-- | macosx/tkMacOSXSend.c | 2 | ||||
-rw-r--r-- | macosx/tkMacOSXTest.c | 2 | ||||
-rw-r--r-- | macosx/tkMacOSXWindowEvent.c | 2 | ||||
-rw-r--r-- | macosx/tkMacOSXWm.c | 14 | ||||
-rw-r--r-- | macosx/ttkMacOSXTheme.c | 6 |
16 files changed, 33 insertions, 33 deletions
diff --git a/macosx/README b/macosx/README index f58184c..b61c1c2 100644 --- a/macosx/README +++ b/macosx/README @@ -32,7 +32,7 @@ available as an optional or default install on recent Mac OS X). TkAqua and TkX11 can be distinguished at runtime via [tk windowingsystem]. - At a minimum, Mac OS X 10.3 is required to run Tcl and TkX11. -TkAqua requires Mac OS X 10.5 or later (starting with Tk 8.6b2). +TkAqua requires Mac OS X 10.5 or later (starting with the Cocoa-based Tk 8.5.7). - Unless weak-linking is used, Tcl/Tk built on Mac OS X 10.x will not run on 10.y with y < x; on the other hand Tcl/Tk built on 10.y will always run on 10.x @@ -105,7 +105,7 @@ normal scrollbar has a small dimension of 15, the small variant 11. Access to the small variant was added in Tk 8.4.2. - The default metrics of native buttons, radiobuttons, checkboxes and -menubuttons in the Cocoa-based Tk 8.6b2 and later preserve compatibility with +menubuttons in the Cocoa-based Tk 8.5.7 and later preserve compatibility with the older Carbon-based implementation, you can turn off the compatibility metrics to get more native-looking spacing by setting: set tk::mac::useCompatibilityMetrics 0 @@ -127,13 +127,13 @@ where -kind is one of -systemType icon for given IconServices 4-char OSType -namedImage named NSImage for given name -imageFile image at given path -This support was added with the Cocoa-based Tk 8.6b2. +This support was added with the Cocoa-based Tk 8.5.7. - TkAqua cursor names are interpred as follows (in order): - standard or platform-specific Tk cursor name (c.f. cursors.n) - @path to any image file readable by NSImage - NSImage named image name -Support for the latter two was added with the Cocoa-based Tk 8.6b2. +Support for the latter two was added with the Cocoa-based Tk 8.5.7. - The standard Tk dialog commands [tk_getOpenFile], [tk_chooseDirectory], [tk_getSaveFile] and [tk_messageBox] all take an additional optional -command @@ -142,7 +142,7 @@ the global level when the dialog closes, with the dialog command's result appended (the dialog command itself returning an emtpy result). If the -parent option is also present, the dialog is configured as a modeless (window-modal) sheet attached to the parent window and the dialog command returns immediately. -Support for -command was added with the Cocoa-based Tk 8.6b2. +Support for -command was added with the Cocoa-based Tk 8.5.7. - The TkAqua-specific [tk::mac::standardAboutPanel] command brings the standard Cocoa about panel to the front, with all its information filled in from your @@ -150,7 +150,7 @@ application bundle files (i.e. standard about panel with no options specified). See Apple Technote TN2179 and the AppKit documentation for -[NSApplication orderFrontStandardAboutPanelWithOptions:] for details on the Info.plist keys and app bundle files used by the about panel. -This support was added with the Cocoa-based Tk 8.6b2. +This support was added with the Cocoa-based Tk 8.5.7. - TkAqua has three special menu names that give access to the standard Application, Window and Help menus, see menu.n for details. @@ -160,7 +160,7 @@ application's Info.plist (or displaying an alert if no Help Book is set). This action can be customized by defining a procedure named [tk::mac::ShowHelp], if present, this procedure is invoked instead by the standard Help menu item. Support for the Window menu and [tk::mac::ShowHelp] was added with the -Cocoa-based Tk 8.6b2. +Cocoa-based Tk 8.5.7. - The TkAqua-specific command [tk::unsupported::MacWindowStyle style] is used to get and set Mac OS X-specific toplevel window class and attributes. Note that @@ -179,12 +179,12 @@ Window attribute names: verticalZoom, closeBox, collapseBox, toolbarButton, sideTitlebar, noTitleBar, unifiedTitleAndToolbar, metal, hud, noShadow, doesNotCycle, noActivates, hideOnSuspend, inWindowMenu, ignoreClicks, doesNotHide, - canJoinAllSpaces, moveToActiveSpace, nonActivating, black, dark, light, + canJoinAllSpaces, moveToActiveSpace, nonActivating, black, dark, light, gray, red, green, blue, cyan, yellow, magenta, orange, purple, brown, clear, opacity Note that not all attributes are valid for all window classes. -Support for the 3 argument form was added with the Cocoa-based Tk 8.6b2, at the +Support for the 3 argument form was added with the Cocoa-based Tk 8.5.7, at the same time support for some legacy Carbon-specific classes and attributes was removed (they are still accepted by the command but no longer have any effect). @@ -195,7 +195,7 @@ tk::unsupported::MacWindowStyle style .f document {metal light opaque closeBox c pack [label .f.f -bg #ababab -text "This is a textured window\nwith opacity and a gray background\nsimilar to other Mac applications"] -fill both -expand yes -The color attributes correspond to system-defined NSColor constants (e.g., red is [NSColor redColor]. The "light" and "dark" attributes correspond to lightGrayColor and darkGrayColor, respectively (because of the way the attributes are parsed, using "lightgray" and "darkgray" would cause a conflict with the core "gray" attribute). +The color attributes correspond to system-defined NSColor constants (e.g., red is [NSColor redColor]. The "light" and "dark" attributes correspond to lightGrayColor and darkGrayColor, respectively (because of the way the attributes are parsed, using "lightgray" and "darkgray" would cause a conflict with the core "gray" attribute). Below are the corresponding hex and/or Tk-defined colors that can be used from Tk widgets to match the NSColor-based attributes: diff --git a/macosx/Wish.sdef b/macosx/Wish.sdef index 26d1ee8..8873e95 100644 --- a/macosx/Wish.sdef +++ b/macosx/Wish.sdef @@ -2,7 +2,7 @@ <!DOCTYPE dictionary SYSTEM "file://localhost/System/Library/DTDs/sdef.dtd"> <!-- Copyright (c) 1997 Sun Microsystems, Inc. - Copyright 2009 Kevin Walzer/WordTech Communications LLC. + Copyright 2009 Kevin Walzer/WordTech Communications LLC. Copyright (c) 2009 Daniel A. Steffen <das@users.sourceforge.net> See the file "license.terms" for information on usage and redistribution of diff --git a/macosx/configure.ac b/macosx/configure.ac index 229af64..69573c5 100644 --- a/macosx/configure.ac +++ b/macosx/configure.ac @@ -3,7 +3,7 @@ dnl This file is an input file used by the GNU "autoconf" program to dnl generate the file "configure", which is run during Tk installation dnl to configure the system for the local environment. -dnl Ensure that the config (auto)headers support is used, then just +dnl Ensure that the config (auto)headers support is used, then just dnl include the configure sources from ../unix: m4_include(../unix/aclocal.m4) diff --git a/macosx/tkMacOSXCursor.c b/macosx/tkMacOSXCursor.c index 24793de..53c2cd2 100644 --- a/macosx/tkMacOSXCursor.c +++ b/macosx/tkMacOSXCursor.c @@ -284,7 +284,7 @@ FindCursorByName( kCGRenderingIntentDefault); CFRelease(provider); } - provider = CGDataProviderCreateWithData(NULL, bitmap + + provider = CGDataProviderCreateWithData(NULL, bitmap + pix*pix/8, pix*pix/8, NULL); if (provider) { mask = CGImageMaskCreate(pix, pix, 1, 1, pix/8, provider, diff --git a/macosx/tkMacOSXDebug.c b/macosx/tkMacOSXDebug.c index 6009f09..78008f0 100644 --- a/macosx/tkMacOSXDebug.c +++ b/macosx/tkMacOSXDebug.c @@ -158,7 +158,7 @@ TkMacOSXGetNamedDebugSymbol( /* * Local Variables: - * mode: c + * mode: objc * c-basic-offset: 4 * fill-column: 79 * coding: utf-8 diff --git a/macosx/tkMacOSXDialog.c b/macosx/tkMacOSXDialog.c index 334b9fd..df1dbab 100644 --- a/macosx/tkMacOSXDialog.c +++ b/macosx/tkMacOSXDialog.c @@ -33,7 +33,7 @@ enum openOptions { }; static const char *const saveOptionStrings[] = { "-defaultextension", "-filetypes", "-initialdir", "-initialfile", - "-message", "-parent", "-title", "-typevariable", "-command", + "-message", "-parent", "-title", "-typevariable", "-command", "-confirmoverwrite", NULL }; enum saveOptions { diff --git a/macosx/tkMacOSXEmbed.c b/macosx/tkMacOSXEmbed.c index 824a995..e2e05d2 100644 --- a/macosx/tkMacOSXEmbed.c +++ b/macosx/tkMacOSXEmbed.c @@ -1177,7 +1177,7 @@ TkpCreateBusy( /* * Local Variables: - * mode: c + * mode: objc * c-basic-offset: 4 * fill-column: 79 * coding: utf-8 diff --git a/macosx/tkMacOSXEntry.c b/macosx/tkMacOSXEntry.c index c103c6d..ab236c6 100644 --- a/macosx/tkMacOSXEntry.c +++ b/macosx/tkMacOSXEntry.c @@ -259,7 +259,7 @@ TkpDrawSpinboxButtons( /* * Local Variables: - * mode: c + * mode: objc * c-basic-offset: 4 * fill-column: 79 * coding: utf-8 diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c index cd9b9e6..01f893e 100644 --- a/macosx/tkMacOSXInit.c +++ b/macosx/tkMacOSXInit.c @@ -387,7 +387,7 @@ TkpInit( Tcl_SetVar(interp, "auto_path", scriptPath, TCL_GLOBAL_ONLY|TCL_LIST_ELEMENT|TCL_APPEND_VALUE); } - + Tcl_CreateObjCommand(interp, "::tk::mac::standardAboutPanel", TkMacOSXStandardAboutPanelObjCmd, NULL, NULL); Tcl_CreateObjCommand(interp, "::tk::mac::iconBitmap", diff --git a/macosx/tkMacOSXRegion.c b/macosx/tkMacOSXRegion.c index ff5944f..8432299 100644 --- a/macosx/tkMacOSXRegion.c +++ b/macosx/tkMacOSXRegion.c @@ -551,7 +551,7 @@ TkMacOSHIShapeUnion( /* * Local Variables: - * mode: c + * mode: objc * c-basic-offset: 4 * fill-column: 79 * coding: utf-8 diff --git a/macosx/tkMacOSXScale.c b/macosx/tkMacOSXScale.c index d69d6a1..e6d93b4 100644 --- a/macosx/tkMacOSXScale.c +++ b/macosx/tkMacOSXScale.c @@ -485,7 +485,7 @@ ScaleActionProc( /* * Local Variables: - * mode: c + * mode: objc * c-basic-offset: 4 * fill-column: 79 * coding: utf-8 diff --git a/macosx/tkMacOSXSend.c b/macosx/tkMacOSXSend.c index b48a8a0..ce5e65b 100644 --- a/macosx/tkMacOSXSend.c +++ b/macosx/tkMacOSXSend.c @@ -507,7 +507,7 @@ SendInit( /* * Local Variables: - * mode: c + * mode: objc * c-basic-offset: 4 * fill-column: 79 * coding: utf-8 diff --git a/macosx/tkMacOSXTest.c b/macosx/tkMacOSXTest.c index 26885a9..7d2b24e 100644 --- a/macosx/tkMacOSXTest.c +++ b/macosx/tkMacOSXTest.c @@ -81,7 +81,7 @@ DebuggerCmd( /* * Local Variables: - * mode: c + * mode: objc * c-basic-offset: 4 * fill-column: 79 * coding: utf-8 diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c index a05302f..f8a0d3b 100644 --- a/macosx/tkMacOSXWindowEvent.c +++ b/macosx/tkMacOSXWindowEvent.c @@ -343,7 +343,7 @@ GenerateUpdates( return 0; } HIShapeGetBounds(damageRgn, &damageBounds); - + CFRelease(damageRgn); CFRelease(boundsRgn); diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c index 3a1da10..1bf6d2c 100644 --- a/macosx/tkMacOSXWm.c +++ b/macosx/tkMacOSXWm.c @@ -1657,14 +1657,14 @@ WmForgetCmd( macWin = (MacDrawable *) winPtr->window; TkFocusJoin(winPtr); - Tk_UnmapWindow(frameWin); + Tk_UnmapWindow(frameWin); macWin->toplevel = winPtr->parentPtr->privatePtr->toplevel; macWin->flags &= ~TK_HOST_EXISTS; TkWmDeadWindow(winPtr); RemapWindows(winPtr, (MacDrawable *) winPtr->parentPtr->window); - + winPtr->flags &= ~(TK_TOP_HIERARCHY|TK_TOP_LEVEL|TK_HAS_WRAPPER|TK_WIN_MANAGED); /* @@ -5328,7 +5328,7 @@ WmWinStyle( ApplyWindowAttributeFlagChanges(winPtr, NULL, oldAttributes, oldFlags, 0, 1); - + return TCL_OK; badClassAttrs: @@ -5492,8 +5492,8 @@ TkMacOSXMakeRealWindowExist( */ [window setMovableByWindowBackground:NO]; } - - + + /* Set background color and opacity of window if those flags are set. */ if (colorName != NULL) { [window setBackgroundColor: colorName]; @@ -5502,7 +5502,7 @@ TkMacOSXMakeRealWindowExist( if (opaqueTag != NULL) { [window setOpaque: opaqueTag]; } - + [window setDocumentEdited:NO]; wmPtr->window = window; macWin->view = contentView; @@ -6391,7 +6391,7 @@ TkMacOSXMakeFullscreen( | NSApplicationPresentationAutoHideMenuBar]; } else { - wmPtr->flags &= ~WM_FULLSCREEN; + wmPtr->flags &= ~WM_FULLSCREEN; [NSApp setPresentationOptions: prevPres]; [window setStyleMask: prevMask]; diff --git a/macosx/ttkMacOSXTheme.c b/macosx/ttkMacOSXTheme.c index fe873f3..5752fb1 100644 --- a/macosx/ttkMacOSXTheme.c +++ b/macosx/ttkMacOSXTheme.c @@ -7,7 +7,7 @@ * Copyright (c) 2005 Neil Madden * Copyright (c) 2006-2009 Daniel A. Steffen <das@users.sourceforge.net> * Copyright 2008-2009, Apple Inc. - * Copyright 2009 Kevin Walzer/WordTech Communications LLC. + * Copyright 2009 Kevin Walzer/WordTech Communications LLC. * * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. @@ -316,7 +316,7 @@ static void TabElementDraw( .size = kHIThemeTabSizeNormal, .adornment = Ttk_StateTableLookup(TabAdornmentTable, state), .kind = kHIThemeTabKindNormal, - .position = Ttk_StateTableLookup(TabPositionTable, state), + .position = Ttk_StateTableLookup(TabPositionTable, state), }; bounds.size.height += TAB_OVERLAP; @@ -1194,7 +1194,7 @@ int Ttk_MacOSXPlatformInit(Tcl_Interp *interp) /* * Local Variables: - * mode: c + * mode: objc * c-basic-offset: 4 * fill-column: 79 * coding: utf-8 |