Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Merge 8.6 |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
a0ab8b7e379f404ab1134b6b759800ba |
| User & Date: | jan.nijtmans 2019-05-09 16:28:41 |
Context
|
2019-05-09
| ||
| 20:52 | Merge 8.6 check-in: 276b273a user: jan.nijtmans tags: trunk | |
| 16:28 | Merge 8.6 check-in: a0ab8b7e user: jan.nijtmans tags: trunk | |
| 15:21 | Whitespace cleanup, syncronize a little with "trunk" version. check-in: 84e2b4b3 user: jan.nijtmans tags: core-8-6-branch | |
|
2019-05-08
| ||
| 08:49 | Fix [51b4b18394]: mac os x: combobox.tcl has old scrollbar for its listbox check-in: 0b9e8c3d user: fvogel tags: trunk | |
Changes
Changes to doc/colors.n.
939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 |
contrasting background. Each numbered color constrasts with its predecessor. .RS .DS systemControlAccentColor systemControlTextColor systemDisabledControlTextColor systemLabelColor systemSelectedTextBackgroundColor systemSelectedTextColor systemTextBackgroundColor systemTextColor systemWindowBackgroundColor systemWindowBackgroundColor1 systemWindowBackgroundColor2 systemWindowBackgroundColor3 systemWindowBackgroundColor4 systemWindowBackgroundColor5 systemWindowBackgroundColor6 |
| | | |
939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 |
contrasting background. Each numbered color constrasts with its predecessor. .RS .DS systemControlAccentColor systemControlTextColor systemDisabledControlTextColor systemLabelColor systemSelectedTextBackgroundColor systemSelectedTextColor systemTextBackgroundColor systemTextColor systemWindowBackgroundColor systemWindowBackgroundColor1 systemWindowBackgroundColor2 systemWindowBackgroundColor3 systemWindowBackgroundColor4 systemWindowBackgroundColor5 systemWindowBackgroundColor6 |
Changes to generic/nanosvg.h.
2828 2829 2830 2831 2832 2833 2834 2835 2836 2837 2838 2839 2840 2841 2842 2843 2844 2845 2846 2847 2848 2849 2850 2851 2852 2853 2854 2855 2856 2857 2858 2859 2860 2861 2862 |
static void nsvg__content(void* ud, const char* s)
{
NSVGparser* p = (NSVGparser*)ud;
if (p->styleFlag) {
int state = 0;
const char* start = NULL;
while (*s) {
char c = *s;
if (nsvg__isspace(c) || c == '{') {
if (state == 1) {
NSVGstyles* next = p->styles;
p->styles = (NSVGstyles*)malloc(sizeof(NSVGstyles));
p->styles->next = next;
p->styles->name = nsvg__strndup(start, (size_t)(s - start));
start = s + 1;
state = 2;
}
} else if (state == 2 && c == '}') {
p->styles->description = nsvg__strndup(start, (size_t)(s - start));
state = 0;
}
else if (state == 0) {
start = s;
state = 1;
}
s++;
/*
if (*s == '{' && state == NSVG_XML_CONTENT) {
// Start of a tag
*s++ = '\0';
nsvg__parseContent(mark, contentCb, ud);
mark = s;
|
| | | |
2828 2829 2830 2831 2832 2833 2834 2835 2836 2837 2838 2839 2840 2841 2842 2843 2844 2845 2846 2847 2848 2849 2850 2851 2852 2853 2854 2855 2856 2857 2858 2859 2860 2861 2862 |
static void nsvg__content(void* ud, const char* s)
{
NSVGparser* p = (NSVGparser*)ud;
if (p->styleFlag) {
int state = 0;
const char* start = NULL;
while (*s) {
char c = *s;
if (nsvg__isspace(c) || c == '{') {
if (state == 1) {
NSVGstyles* next = p->styles;
p->styles = (NSVGstyles*)malloc(sizeof(NSVGstyles));
p->styles->next = next;
p->styles->name = nsvg__strndup(start, (size_t)(s - start));
start = s + 1;
state = 2;
}
} else if (state == 2 && c == '}') {
p->styles->description = nsvg__strndup(start, (size_t)(s - start));
state = 0;
}
else if (state == 0) {
start = s;
state = 1;
}
s++;
/*
if (*s == '{' && state == NSVG_XML_CONTENT) {
// Start of a tag
*s++ = '\0';
nsvg__parseContent(mark, contentCb, ud);
mark = s;
|
Changes to generic/tkButton.c.
1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 |
/*
* If a radiobutton has the empty string as value it should be
* selected.
*/
if ((butPtr->type == TYPE_RADIO_BUTTON) &&
(*Tcl_GetString(butPtr->onValuePtr) == 0)) {
butPtr->flags |= SELECTED;
}
}
}
/*
* Get the images for the widget, if there are any. Allocate the new
|
| |
1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 |
/*
* If a radiobutton has the empty string as value it should be
* selected.
*/
if ((butPtr->type == TYPE_RADIO_BUTTON) &&
(*Tcl_GetString(butPtr->onValuePtr) == '\0')) {
butPtr->flags |= SELECTED;
}
}
}
/*
* Get the images for the widget, if there are any. Allocate the new
|
Changes to generic/tkCanvArc.c.
474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 |
}
/*
* Override the start and extent if the height is given.
*/
ComputeArcParametersFromHeight(arcPtr);
ComputeArcBbox(canvas, arcPtr);
i = (int) (arcPtr->start/360.0);
arcPtr->start -= i*360.0;
if (arcPtr->start < 0) {
arcPtr->start += 360.0;
}
|
| |
474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 |
}
/*
* Override the start and extent if the height is given.
*/
ComputeArcParametersFromHeight(arcPtr);
ComputeArcBbox(canvas, arcPtr);
i = (int) (arcPtr->start/360.0);
arcPtr->start -= i*360.0;
if (arcPtr->start < 0) {
arcPtr->start += 360.0;
}
|
Changes to generic/tkPkgConfig.c.
118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 |
{"includedir,runtime", CFG_RUNTIME_INCDIR},
#endif
#ifdef CFG_RUNTIME_DOCDIR
{"docdir,runtime", CFG_RUNTIME_DOCDIR},
#endif
#ifdef CFG_RUNTIME_DEMODIR
{"demodir,runtime", CFG_RUNTIME_DEMODIR},
#endif
/* Installation paths to various stuff */
#ifdef CFG_INSTALL_LIBDIR
{"libdir,install", CFG_INSTALL_LIBDIR},
#endif
#ifdef CFG_INSTALL_BINDIR
|
| |
118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 |
{"includedir,runtime", CFG_RUNTIME_INCDIR},
#endif
#ifdef CFG_RUNTIME_DOCDIR
{"docdir,runtime", CFG_RUNTIME_DOCDIR},
#endif
#ifdef CFG_RUNTIME_DEMODIR
{"demodir,runtime", CFG_RUNTIME_DEMODIR},
#endif
/* Installation paths to various stuff */
#ifdef CFG_INSTALL_LIBDIR
{"libdir,install", CFG_INSTALL_LIBDIR},
#endif
#ifdef CFG_INSTALL_BINDIR
|
Changes to generic/tkPlace.c.
691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 |
if (slavePtr->tkwin == tkwin) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"can't place %s relative to itself",
Tk_PathName(slavePtr->tkwin)));
Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "LOOP", NULL);
goto error;
}
/*
* Check for management loops.
*/
for (master = (TkWindow *)tkwin; master != NULL;
master = (TkWindow *)TkGetGeomMaster(master)) {
if (master == (TkWindow *)slavePtr->tkwin) {
|
| |
691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 |
if (slavePtr->tkwin == tkwin) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"can't place %s relative to itself",
Tk_PathName(slavePtr->tkwin)));
Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "LOOP", NULL);
goto error;
}
/*
* Check for management loops.
*/
for (master = (TkWindow *)tkwin; master != NULL;
master = (TkWindow *)TkGetGeomMaster(master)) {
if (master == (TkWindow *)slavePtr->tkwin) {
|
Changes to generic/ttk/ttkEntry.c.
997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 |
static int EntryConfigure(Tcl_Interp *interp, void *recordPtr, int mask)
{
Entry *entryPtr = recordPtr;
Tcl_Obj *textVarName = entryPtr->entry.textVariableObj;
Ttk_TraceHandle *vt = 0;
if (mask & TEXTVAR_CHANGED) {
if (textVarName && *Tcl_GetString(textVarName)) {
vt = Ttk_TraceVariable(interp,
textVarName,EntryTextVariableTrace,entryPtr);
if (!vt) return TCL_ERROR;
}
}
if (TtkCoreConfigure(interp, recordPtr, mask) != TCL_OK) {
|
| |
997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 |
static int EntryConfigure(Tcl_Interp *interp, void *recordPtr, int mask)
{
Entry *entryPtr = recordPtr;
Tcl_Obj *textVarName = entryPtr->entry.textVariableObj;
Ttk_TraceHandle *vt = 0;
if (mask & TEXTVAR_CHANGED) {
if (textVarName && *Tcl_GetString(textVarName) != '\0') {
vt = Ttk_TraceVariable(interp,
textVarName,EntryTextVariableTrace,entryPtr);
if (!vt) return TCL_ERROR;
}
}
if (TtkCoreConfigure(interp, recordPtr, mask) != TCL_OK) {
|
Changes to library/button.tcl.
749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 |
}
# Restore the original button "selected" color; but only if the user
# has not changed it in the meantime.
if {![$w cget -indicatoron] && [info exist Priv($w,selectcolor)]} {
if {[$w cget -selectcolor] eq $Priv($w,selectcolor)
|| ([info exist Priv($w,aselectcolor)] &&
[$w cget -selectcolor] eq $Priv($w,aselectcolor))} {
$w configure -selectcolor $Priv($w,selectcolor)
}
}
unset -nocomplain Priv($w,selectcolor) Priv($w,aselectcolor)
# Restore the original button relief if it was changed by Tk. That is
|
| |
749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 |
}
# Restore the original button "selected" color; but only if the user
# has not changed it in the meantime.
if {![$w cget -indicatoron] && [info exist Priv($w,selectcolor)]} {
if {[$w cget -selectcolor] eq $Priv($w,selectcolor)
|| ([info exist Priv($w,aselectcolor)] &&
[$w cget -selectcolor] eq $Priv($w,aselectcolor))} {
$w configure -selectcolor $Priv($w,selectcolor)
}
}
unset -nocomplain Priv($w,selectcolor) Priv($w,aselectcolor)
# Restore the original button relief if it was changed by Tk. That is
|
Changes to macosx/tkMacOSXButton.c.
181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 |
{
MacButton *macButtonPtr = clientData;
TkButton *butPtr = clientData;
Tk_Window tkwin = butPtr->tkwin;
Pixmap pixmap;
DrawParams* dpPtr = &macButtonPtr->drawParams;
int needhighlight = 0;
if (butPtr->flags & BUTTON_DELETED) {
return;
}
butPtr->flags &= ~REDRAW_PENDING;
if ((butPtr->tkwin == NULL) || !Tk_IsMapped(tkwin)) {
return;
}
pixmap = (Pixmap) Tk_WindowId(tkwin);
/*
* Set up clipping region. Make sure the we are using the port
* for this button, or we will set the wrong window's clip.
*/
TkMacOSXSetUpClippingRgn(Tk_WindowId(tkwin));
if (TkMacOSXComputeButtonDrawParams(butPtr, dpPtr)) {
macButtonPtr->useTkText = 0;
} else {
macButtonPtr->useTkText = 1;
}
|
| | |
181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 |
{
MacButton *macButtonPtr = clientData;
TkButton *butPtr = clientData;
Tk_Window tkwin = butPtr->tkwin;
Pixmap pixmap;
DrawParams* dpPtr = &macButtonPtr->drawParams;
int needhighlight = 0;
if (butPtr->flags & BUTTON_DELETED) {
return;
}
butPtr->flags &= ~REDRAW_PENDING;
if ((butPtr->tkwin == NULL) || !Tk_IsMapped(tkwin)) {
return;
}
pixmap = (Pixmap) Tk_WindowId(tkwin);
/*
* Set up clipping region. Make sure the we are using the port
* for this button, or we will set the wrong window's clip.
*/
TkMacOSXSetUpClippingRgn(Tk_WindowId(tkwin));
if (TkMacOSXComputeButtonDrawParams(butPtr, dpPtr)) {
macButtonPtr->useTkText = 0;
} else {
macButtonPtr->useTkText = 1;
}
|
Changes to macosx/tkMacOSXColor.c.
262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 ... 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 ... 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 |
* None.
*
*----------------------------------------------------------------------
*/
static NSColorSpace* deviceRGB = NULL;
static CGFloat blueAccentRGBA[4] = {0, 122.0 / 255, 1.0, 1.0};
static CGFloat windowBackground[4] =
{236.0 / 255, 236.0 / 255, 236.0 / 255, 1.0};
static OSStatus
SetCGColorComponents(
struct SystemColorMapEntry entry,
unsigned long pixel,
CGColorRef *c)
{
OSStatus err = noErr;
NSColor *bgColor, *color;
CGFloat rgba[4] = {0, 0, 0, 1};
#if MAC_OS_X_VERSION_MAX_ALLOWED < 101400
NSInteger colorVariant;
static CGFloat graphiteAccentRGBA[4] =
{152.0 / 255, 152.0 / 255, 152.0 / 255, 1.0};
#endif
if (!deviceRGB) {
deviceRGB = [NSColorSpace deviceRGBColorSpace];
}
................................................................................
case 5:
if ([NSApp macMinorVersion] > 6) {
color = [[NSColor whiteColor] colorUsingColorSpace:
deviceRGB];
} else {
color = [[NSColor blackColor] colorUsingColorSpace:
deviceRGB];
}
break;
case 6:
color = [[NSColor textBackgroundColor] colorUsingColorSpace:
deviceRGB];
break;
case 7:
color = [[NSColor selectedTextBackgroundColor] colorUsingColorSpace:
................................................................................
}
break;
case HIText:
err = ChkErr(HIThemeSetTextFill, entry.value, NULL, context,
kHIThemeOrientationNormal);
break;
case HIBackground:
info.kind = entry.value;
rect = CGContextGetClipBoundingBox(context);
err = ChkErr(HIThemeApplyBackground, &rect, &info,
context, kHIThemeOrientationNormal);
break;
default:
err = ChkErr(SetCGColorComponents, entry, pixel, &cgColor);
if (err == noErr) {
|
| | | | |
262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 ... 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 ... 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 |
* None.
*
*----------------------------------------------------------------------
*/
static NSColorSpace* deviceRGB = NULL;
static CGFloat blueAccentRGBA[4] = {0, 122.0 / 255, 1.0, 1.0};
static CGFloat windowBackground[4] =
{236.0 / 255, 236.0 / 255, 236.0 / 255, 1.0};
static OSStatus
SetCGColorComponents(
struct SystemColorMapEntry entry,
unsigned long pixel,
CGColorRef *c)
{
OSStatus err = noErr;
NSColor *bgColor, *color;
CGFloat rgba[4] = {0, 0, 0, 1};
#if MAC_OS_X_VERSION_MAX_ALLOWED < 101400
NSInteger colorVariant;
static CGFloat graphiteAccentRGBA[4] =
{152.0 / 255, 152.0 / 255, 152.0 / 255, 1.0};
#endif
if (!deviceRGB) {
deviceRGB = [NSColorSpace deviceRGBColorSpace];
}
................................................................................
case 5:
if ([NSApp macMinorVersion] > 6) {
color = [[NSColor whiteColor] colorUsingColorSpace:
deviceRGB];
} else {
color = [[NSColor blackColor] colorUsingColorSpace:
deviceRGB];
}
break;
case 6:
color = [[NSColor textBackgroundColor] colorUsingColorSpace:
deviceRGB];
break;
case 7:
color = [[NSColor selectedTextBackgroundColor] colorUsingColorSpace:
................................................................................
}
break;
case HIText:
err = ChkErr(HIThemeSetTextFill, entry.value, NULL, context,
kHIThemeOrientationNormal);
break;
case HIBackground:
info.kind = entry.value;
rect = CGContextGetClipBoundingBox(context);
err = ChkErr(HIThemeApplyBackground, &rect, &info,
context, kHIThemeOrientationNormal);
break;
default:
err = ChkErr(SetCGColorComponents, entry, pixel, &cgColor);
if (err == noErr) {
|
Changes to macosx/tkMacOSXDefault.h.
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
...
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
|
#define DEF_BUTTON_ANCHOR "center" #define DEF_BUTTON_ACTIVE_BG_COLOR ACTIVE_BG #define DEF_BUTTON_ACTIVE_BG_MONO BLACK #define DEF_BUTTON_ACTIVE_FG_COLOR ACTIVE_FG #define DEF_CHKRAD_ACTIVE_FG_COLOR DEF_BUTTON_ACTIVE_FG_COLOR #define DEF_BUTTON_ACTIVE_FG_MONO WHITE /* #define DEF_BUTTON_BG_COLOR "systemButtonFace"*/ #define DEF_BUTTON_BG_COLOR NORMAL_BG #define DEF_BUTTON_BG_MONO WHITE #define DEF_BUTTON_BITMAP "" #define DEF_BUTTON_BORDER_WIDTH "2" #define DEF_BUTTON_CURSOR "" #define DEF_BUTTON_COMMAND "" #define DEF_BUTTON_COMPOUND "none" ................................................................................ #define DEF_ENTRY_DISABLED_BG_MONO WHITE #define DEF_ENTRY_DISABLED_FG DISABLED #define DEF_ENTRY_EXPORT_SELECTION "1" #define DEF_ENTRY_FONT "TkTextFont" #define DEF_ENTRY_FG NORMAL_FG #define DEF_ENTRY_HIGHLIGHT_BG NORMAL_BG #define DEF_ENTRY_HIGHLIGHT BLACK /* #define DEF_ENTRY_HIGHLIGHT_WIDTH "3" */ #define DEF_ENTRY_HIGHLIGHT_WIDTH "3" #define DEF_ENTRY_INSERT_BG NORMAL_FG #define DEF_ENTRY_INSERT_BD_COLOR "0" #define DEF_ENTRY_INSERT_BD_MONO "0" #define DEF_ENTRY_INSERT_OFF_TIME "300" #define DEF_ENTRY_INSERT_ON_TIME "600" /* #define DEF_ENTRY_INSERT_WIDTH "2" */ #define DEF_ENTRY_INSERT_WIDTH "1" #define DEF_ENTRY_JUSTIFY "left" #define DEF_ENTRY_PLACEHOLDER "" #define DEF_ENTRY_PLACEHOLDERFG "#b3b3b3" #define DEF_ENTRY_READONLY_BG_COLOR NORMAL_BG #define DEF_ENTRY_READONLY_BG_MONO WHITE #define DEF_ENTRY_RELIEF "sunken" /* #define DEF_ENTRY_RELIEF "solid" */ #define DEF_ENTRY_SCROLL_COMMAND "" #define DEF_ENTRY_SELECT_COLOR SELECT_BG #define DEF_ENTRY_SELECT_MONO BLACK #define DEF_ENTRY_SELECT_BD_COLOR "1" #define DEF_ENTRY_SELECT_BD_MONO "0" #define DEF_ENTRY_SELECT_FG_COLOR SELECT_FG #define DEF_ENTRY_SELECT_FG_MONO WHITE |
<
<
<
<
|
52
53
54
55
56
57
58
59
60
61
62
63
64
65
...
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
|
#define DEF_BUTTON_ANCHOR "center"
#define DEF_BUTTON_ACTIVE_BG_COLOR ACTIVE_BG
#define DEF_BUTTON_ACTIVE_BG_MONO BLACK
#define DEF_BUTTON_ACTIVE_FG_COLOR ACTIVE_FG
#define DEF_CHKRAD_ACTIVE_FG_COLOR DEF_BUTTON_ACTIVE_FG_COLOR
#define DEF_BUTTON_ACTIVE_FG_MONO WHITE
#define DEF_BUTTON_BG_COLOR NORMAL_BG
#define DEF_BUTTON_BG_MONO WHITE
#define DEF_BUTTON_BITMAP ""
#define DEF_BUTTON_BORDER_WIDTH "2"
#define DEF_BUTTON_CURSOR ""
#define DEF_BUTTON_COMMAND ""
#define DEF_BUTTON_COMPOUND "none"
................................................................................
#define DEF_ENTRY_DISABLED_BG_MONO WHITE
#define DEF_ENTRY_DISABLED_FG DISABLED
#define DEF_ENTRY_EXPORT_SELECTION "1"
#define DEF_ENTRY_FONT "TkTextFont"
#define DEF_ENTRY_FG NORMAL_FG
#define DEF_ENTRY_HIGHLIGHT_BG NORMAL_BG
#define DEF_ENTRY_HIGHLIGHT BLACK
#define DEF_ENTRY_HIGHLIGHT_WIDTH "3"
#define DEF_ENTRY_INSERT_BG NORMAL_FG
#define DEF_ENTRY_INSERT_BD_COLOR "0"
#define DEF_ENTRY_INSERT_BD_MONO "0"
#define DEF_ENTRY_INSERT_OFF_TIME "300"
#define DEF_ENTRY_INSERT_ON_TIME "600"
#define DEF_ENTRY_INSERT_WIDTH "1"
#define DEF_ENTRY_JUSTIFY "left"
#define DEF_ENTRY_PLACEHOLDER ""
#define DEF_ENTRY_PLACEHOLDERFG "#b3b3b3"
#define DEF_ENTRY_READONLY_BG_COLOR NORMAL_BG
#define DEF_ENTRY_READONLY_BG_MONO WHITE
#define DEF_ENTRY_RELIEF "sunken"
#define DEF_ENTRY_SCROLL_COMMAND ""
#define DEF_ENTRY_SELECT_COLOR SELECT_BG
#define DEF_ENTRY_SELECT_MONO BLACK
#define DEF_ENTRY_SELECT_BD_COLOR "1"
#define DEF_ENTRY_SELECT_BD_MONO "0"
#define DEF_ENTRY_SELECT_FG_COLOR SELECT_FG
#define DEF_ENTRY_SELECT_FG_MONO WHITE
|
Changes to macosx/tkMacOSXDialog.c.
38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 |
bool userHasSelectedFilter; /* The user has changed the filter in
* the accessory view. */
NSMutableArray *fileTypeNames; /* Array of names, e.g. "Text
* document". */
NSMutableArray *fileTypeExtensions; /* Array of allowed extensions per
* name, e.g. "txt", "doc". */
NSMutableArray *fileTypeLabels; /* Displayed string, e.g. "Text
* document (.txt, .doc)". */
NSMutableArray *fileTypeAllowsAll; /* Boolean if the all pattern (*.*) is
* included. */
NSMutableArray *allowedExtensions; /* Set of all allowed extensions. */
bool allowedExtensionsAllowAll; /* Set of all allowed extensions
* includes *.* */
NSUInteger fileTypeIndex; /* Index of currently selected
* filter. */
|
| |
38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 |
bool userHasSelectedFilter; /* The user has changed the filter in
* the accessory view. */
NSMutableArray *fileTypeNames; /* Array of names, e.g. "Text
* document". */
NSMutableArray *fileTypeExtensions; /* Array of allowed extensions per
* name, e.g. "txt", "doc". */
NSMutableArray *fileTypeLabels; /* Displayed string, e.g. "Text
* document (.txt, .doc)". */
NSMutableArray *fileTypeAllowsAll; /* Boolean if the all pattern (*.*) is
* included. */
NSMutableArray *allowedExtensions; /* Set of all allowed extensions. */
bool allowedExtensionsAllowAll; /* Set of all allowed extensions
* includes *.* */
NSUInteger fileTypeIndex; /* Index of currently selected
* filter. */
|
Changes to macosx/tkMacOSXInit.c.
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
...
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
|
[self _setupApplicationNotifications];
/*
* Construct the menu bar.
*/
_defaultMainMenu = nil;
[self _setupMenus];
/*
* Initialize event processing.
*/
TkMacOSXInitAppleEvents(_eventInterp);
/*
* Initialize the graphics context.
................................................................................
[NSApp activateIgnoringOtherApps: YES];
/*
* Process events to ensure that the root window is fully initialized. See
* ticket 56a1823c73.
*/
[NSApp _lockAutoreleasePool];
while (Tcl_DoOneEvent(TCL_WINDOW_EVENTS| TCL_DONT_WAIT)) {}
[NSApp _unlockAutoreleasePool];
}
- (void) _setup: (Tcl_Interp *) interp
{
|
<
|
|
97
98
99
100
101
102
103
104
105
106
107
108
109
110
...
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
|
[self _setupApplicationNotifications];
/*
* Construct the menu bar.
*/
_defaultMainMenu = nil;
[self _setupMenus];
/*
* Initialize event processing.
*/
TkMacOSXInitAppleEvents(_eventInterp);
/*
* Initialize the graphics context.
................................................................................
[NSApp activateIgnoringOtherApps: YES];
/*
* Process events to ensure that the root window is fully initialized. See
* ticket 56a1823c73.
*/
[NSApp _lockAutoreleasePool];
while (Tcl_DoOneEvent(TCL_WINDOW_EVENTS| TCL_DONT_WAIT)) {}
[NSApp _unlockAutoreleasePool];
}
- (void) _setup: (Tcl_Interp *) interp
{
|
Changes to macosx/tkMacOSXMenubutton.c.
344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 |
width = butPtr->width * avgWidth + 2*butPtr->padX;
}
if (butPtr->height > 0) {
height = butPtr->height * fm.linespace + 2*butPtr->padY;
}
}
}
butPtr->inset = highlightWidth + butPtr->borderWidth;
width += LEFT_INSET + RIGHT_INSET + 2*butPtr->inset;
height += 2*butPtr->inset;
height = height < MIN_HEIGHT ? MIN_HEIGHT : height;
Tk_GeometryRequest(butPtr->tkwin, width, height);
Tk_SetInternalBorder(butPtr->tkwin, butPtr->inset);
}
|
| |
344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 |
width = butPtr->width * avgWidth + 2*butPtr->padX;
}
if (butPtr->height > 0) {
height = butPtr->height * fm.linespace + 2*butPtr->padY;
}
}
}
butPtr->inset = highlightWidth + butPtr->borderWidth;
width += LEFT_INSET + RIGHT_INSET + 2*butPtr->inset;
height += 2*butPtr->inset;
height = height < MIN_HEIGHT ? MIN_HEIGHT : height;
Tk_GeometryRequest(butPtr->tkwin, width, height);
Tk_SetInternalBorder(butPtr->tkwin, butPtr->inset);
}
|
Changes to macosx/tkMacOSXMouseEvent.c.
240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 |
tkwin, global.x, global.y, state);
#endif
Tk_UpdatePointer(tkwin, global.x, global.y, state);
} else {
/*
* For scroll wheel events we need to send the XEvent here.
*/
CGFloat delta;
int coarseDelta;
XEvent xEvent;
xEvent.type = MouseWheelEvent;
xEvent.xbutton.x = local.x;
xEvent.xbutton.y = local.y;
|
| |
240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 |
tkwin, global.x, global.y, state);
#endif
Tk_UpdatePointer(tkwin, global.x, global.y, state);
} else {
/*
* For scroll wheel events we need to send the XEvent here.
*/
CGFloat delta;
int coarseDelta;
XEvent xEvent;
xEvent.type = MouseWheelEvent;
xEvent.xbutton.x = local.x;
xEvent.xbutton.y = local.y;
|
Changes to macosx/tkMacOSXSubwindows.c.
164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 |
[NSApp activateIgnoringOtherApps:NO];
[[win contentView] setNeedsDisplay:YES];
if ([win canBecomeKeyWindow]) {
[win makeKeyAndOrderFront:NSApp];
} else {
[win orderFrontRegardless];
}
/*
* In some cases the toplevel will not be drawn unless we process
* all pending events now. See ticket 56a1823c73.
*/
[NSApp _lockAutoreleasePool];
while (Tcl_DoOneEvent(TCL_WINDOW_EVENTS| TCL_DONT_WAIT)) {}
|
| |
164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 |
[NSApp activateIgnoringOtherApps:NO];
[[win contentView] setNeedsDisplay:YES];
if ([win canBecomeKeyWindow]) {
[win makeKeyAndOrderFront:NSApp];
} else {
[win orderFrontRegardless];
}
/*
* In some cases the toplevel will not be drawn unless we process
* all pending events now. See ticket 56a1823c73.
*/
[NSApp _lockAutoreleasePool];
while (Tcl_DoOneEvent(TCL_WINDOW_EVENTS| TCL_DONT_WAIT)) {}
|
Changes to macosx/tkMacOSXWindowEvent.c.
892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 |
{
NSView *view = (NSView *) clientdata;
/*
* Make sure that we are not trying to displaying a view that no longer
* exists.
*/
for (NSWindow *w in [NSApp orderedWindows]) {
if ([w contentView] == view) {
[view setNeedsDisplay:YES];
break;
}
}
}
|
| |
892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 |
{
NSView *view = (NSView *) clientdata;
/*
* Make sure that we are not trying to displaying a view that no longer
* exists.
*/
for (NSWindow *w in [NSApp orderedWindows]) {
if ([w contentView] == view) {
[view setNeedsDisplay:YES];
break;
}
}
}
|
Changes to macosx/tkMacOSXWm.c.
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
1751
1752
1753
1754
1755
....
3606
3607
3608
3609
3610
3611
3612
3613
3614
3615
3616
3617
3618
3619
3620
|
}
if (objc == 3) {
if (wmPtr->commandObj != NULL) {
Tcl_SetObjResult(interp, wmPtr->commandObj);
}
return TCL_OK;
}
if (Tcl_GetString(objv[3])[0] == 0) {
if (wmPtr->commandObj != NULL) {
Tcl_DecrRefCount(wmPtr->commandObj);
wmPtr->commandObj = NULL;
}
return TCL_OK;
}
if (Tcl_ListObjLength(interp, objv[3], &len) != TCL_OK) {
................................................................................
if (objc == 3) {
if (wmPtr->master != NULL) {
Tcl_SetObjResult(interp,
Tcl_NewStringObj(Tk_PathName(wmPtr->master), -1));
}
return TCL_OK;
}
if (Tcl_GetString(objv[3])[0] == '\0') {
RemoveTransient(winPtr);
} else {
if (TkGetWindowFromObj(interp, tkwin, objv[3], &master) != TCL_OK) {
return TCL_ERROR;
}
masterPtr = (TkWindow*) master;
while (!Tk_TopWinHierarchy(masterPtr)) {
|
|
|
|
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
1751
1752
1753
1754
1755
....
3606
3607
3608
3609
3610
3611
3612
3613
3614
3615
3616
3617
3618
3619
3620
|
}
if (objc == 3) {
if (wmPtr->commandObj != NULL) {
Tcl_SetObjResult(interp, wmPtr->commandObj);
}
return TCL_OK;
}
if (*Tcl_GetString(objv[3]) == '\0') {
if (wmPtr->commandObj != NULL) {
Tcl_DecrRefCount(wmPtr->commandObj);
wmPtr->commandObj = NULL;
}
return TCL_OK;
}
if (Tcl_ListObjLength(interp, objv[3], &len) != TCL_OK) {
................................................................................
if (objc == 3) {
if (wmPtr->master != NULL) {
Tcl_SetObjResult(interp,
Tcl_NewStringObj(Tk_PathName(wmPtr->master), -1));
}
return TCL_OK;
}
if (*Tcl_GetString(objv[3]) == '\0') {
RemoveTransient(winPtr);
} else {
if (TkGetWindowFromObj(interp, tkwin, objv[3], &master) != TCL_OK) {
return TCL_ERROR;
}
masterPtr = (TkWindow*) master;
while (!Tk_TopWinHierarchy(masterPtr)) {
|
Changes to macosx/ttkMacOSXTheme.c.
272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 ... 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 ... 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 .... 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 |
} } /*---------------------------------------------------------------------- * +++ Single Arrow Buttons -- * * Used in ListHeaders and Comboboxes. */ static void DrawDownArrow( CGContextRef context, CGRect bounds, CGFloat inset, CGFloat size, ................................................................................ CGContextAddLines(context, arrow, 3); CGContextStrokePath(context); } /*---------------------------------------------------------------------- * +++ Double Arrow Buttons -- * * Used in MenuButtons and SpinButtons. */ static void DrawUpDownArrows( CGContextRef context, CGRect bounds, CGFloat inset, CGFloat size, ................................................................................ originalBounds.origin.y + 1); CGContextAddLineToPoint(context, originalBounds.origin.x, originalBounds.origin.y + originalBounds.size.height - 1); CGContextStrokePath(context); CGContextRestoreGState(context); } } else { /* * This is the selected tab; paint it blue. If it is first, cover up * the separator line drawn by the second one. (The selected tab is * always drawn last.) */ if ((state & TTK_STATE_FIRST_TAB) && !(state & TTK_STATE_LAST_TAB)) { ................................................................................ ListHeaderParams = {kThemeListHeaderButton, kThemeMetricListHeaderHeight}; static Ttk_StateTable ButtonValueTable[] = { {kThemeButtonMixed, TTK_STATE_ALTERNATE, 0}, {kThemeButtonOn, TTK_STATE_SELECTED, 0}, {kThemeButtonOff, 0, 0} /* * Others: kThemeDisclosureRight, kThemeDisclosureDown, * kThemeDisclosureLeft */ }; static Ttk_StateTable ButtonAdornmentTable[] = { {kThemeAdornmentDefault | kThemeAdornmentFocus, |
| | | | |
272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 ... 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 ... 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 .... 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 |
}
}
/*----------------------------------------------------------------------
* +++ Single Arrow Buttons --
*
* Used in ListHeaders and Comboboxes.
*/
static void DrawDownArrow(
CGContextRef context,
CGRect bounds,
CGFloat inset,
CGFloat size,
................................................................................
CGContextAddLines(context, arrow, 3);
CGContextStrokePath(context);
}
/*----------------------------------------------------------------------
* +++ Double Arrow Buttons --
*
* Used in MenuButtons and SpinButtons.
*/
static void DrawUpDownArrows(
CGContextRef context,
CGRect bounds,
CGFloat inset,
CGFloat size,
................................................................................
originalBounds.origin.y + 1);
CGContextAddLineToPoint(context, originalBounds.origin.x,
originalBounds.origin.y + originalBounds.size.height - 1);
CGContextStrokePath(context);
CGContextRestoreGState(context);
}
} else {
/*
* This is the selected tab; paint it blue. If it is first, cover up
* the separator line drawn by the second one. (The selected tab is
* always drawn last.)
*/
if ((state & TTK_STATE_FIRST_TAB) && !(state & TTK_STATE_LAST_TAB)) {
................................................................................
ListHeaderParams =
{kThemeListHeaderButton, kThemeMetricListHeaderHeight};
static Ttk_StateTable ButtonValueTable[] = {
{kThemeButtonMixed, TTK_STATE_ALTERNATE, 0},
{kThemeButtonOn, TTK_STATE_SELECTED, 0},
{kThemeButtonOff, 0, 0}
/*
* Others: kThemeDisclosureRight, kThemeDisclosureDown,
* kThemeDisclosureLeft
*/
};
static Ttk_StateTable ButtonAdornmentTable[] = {
{kThemeAdornmentDefault | kThemeAdornmentFocus,
|
Changes to tests/textWind.test.
38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 |
wm minsize . 1 1
wm positionfrom . user
wm deiconify .
# This update is needed on MacOS to make sure that the window is mapped
# when the tests begin.
update
set bw [.t cget -borderwidth]
set px [.t cget -padx]
set py [.t cget -pady]
set hlth [.t cget -highlightthickness]
set padx [expr {$bw+$px+$hlth}]
set pady [expr {$bw+$py+$hlth}]
|
| |
38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 |
wm minsize . 1 1
wm positionfrom . user
wm deiconify .
# This update is needed on MacOS to make sure that the window is mapped
# when the tests begin.
update
set bw [.t cget -borderwidth]
set px [.t cget -padx]
set py [.t cget -pady]
set hlth [.t cget -highlightthickness]
set padx [expr {$bw+$px+$hlth}]
set pady [expr {$bw+$py+$hlth}]
|
Changes to tests/ttk/scrollbar.test.
14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 |
test scrollbar-swapout-1 "Don't use core scrollbars on OSX..." \
-constraints {
coreScrollbar
} -body {
ttk::scrollbar .sb -command "yadda"
list [winfo class .sb] [.sb cget -command]
} -result [list TScrollbar yadda] -cleanup {
destroy .sb
}
test scrollbar-swapout-2 "... regardless of whether -style ..." \
-constraints {
coreScrollbar
} -body {
ttk::style layout Vertical.Custom.TScrollbar \
|
| | |
14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 |
test scrollbar-swapout-1 "Don't use core scrollbars on OSX..." \
-constraints {
coreScrollbar
} -body {
ttk::scrollbar .sb -command "yadda"
list [winfo class .sb] [.sb cget -command]
} -result [list TScrollbar yadda] -cleanup {
destroy .sb
}
test scrollbar-swapout-2 "... regardless of whether -style ..." \
-constraints {
coreScrollbar
} -body {
ttk::style layout Vertical.Custom.TScrollbar \
|