diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-01-12 09:46:26 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-01-12 09:46:26 (GMT) |
| commit | c84948f660d87bfecd5cf830a4986d95f00c1e4a (patch) | |
| tree | e3fa63adcd3593c816750f84f855789fd50af1c8 /macosx | |
| parent | 430f5c9c144dca634ae3af7b82619b9bff00d64a (diff) | |
| download | tk-c84948f660d87bfecd5cf830a4986d95f00c1e4a.zip tk-c84948f660d87bfecd5cf830a4986d95f00c1e4a.tar.gz tk-c84948f660d87bfecd5cf830a4986d95f00c1e4a.tar.bz2 | |
Bring back DEF_TEXT_SPACING[123], since "0" is not exactly equal to NULL (just to be 100% sure there will not be a behavioral change)bug_2049429fff
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/tkMacOSXDefault.h | 3 | ||||
| -rw-r--r-- | macosx/tkMacOSXDialog.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/macosx/tkMacOSXDefault.h b/macosx/tkMacOSXDefault.h index b24c540..528ea10 100644 --- a/macosx/tkMacOSXDefault.h +++ b/macosx/tkMacOSXDefault.h @@ -536,6 +536,9 @@ #define DEF_TEXT_SELECT_FG_MONO WHITE #define DEF_TEXT_SELECT_RELIEF "flat" #define DEF_TEXT_SET_GRID "0" +#define DEF_TEXT_SPACING1 "0" +#define DEF_TEXT_SPACING2 "0" +#define DEF_TEXT_SPACING3 "0" #define DEF_TEXT_STATE "normal" #define DEF_TEXT_TABS "" #define DEF_TEXT_TABSTYLE "tabular" diff --git a/macosx/tkMacOSXDialog.c b/macosx/tkMacOSXDialog.c index 8e49f65..f6edb6d 100644 --- a/macosx/tkMacOSXDialog.c +++ b/macosx/tkMacOSXDialog.c @@ -514,7 +514,7 @@ Tk_GetOpenFileObjCmd( callbackInfo->multiple = multiple; parent = TkMacOSXDrawableWindow(((TkWindow *) tkwin)->window); if (haveParentOption && parent && ![parent attachedSheet]) { - parentIsKey = [parent isKeyWindow]; + parentIsKey = [parent isKeyWindow]; #if MAC_OS_X_VERSION_MIN_REQUIRED < 1060 [panel beginSheetForDirectory:directory file:filename @@ -860,7 +860,7 @@ Tk_ChooseDirectoryObjCmd( callbackInfo->multiple = 0; parent = TkMacOSXDrawableWindow(((TkWindow *) tkwin)->window); if (haveParentOption && parent && ![parent attachedSheet]) { - parentIsKey = [parent isKeyWindow]; + parentIsKey = [parent isKeyWindow]; #if MAC_OS_X_VERSION_MIN_REQUIRED < 1060 [panel beginSheetForDirectory:directory file:filename |