summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2016-01-12 09:46:26 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2016-01-12 09:46:26 (GMT)
commitc84948f660d87bfecd5cf830a4986d95f00c1e4a (patch)
treee3fa63adcd3593c816750f84f855789fd50af1c8
parent430f5c9c144dca634ae3af7b82619b9bff00d64a (diff)
downloadtk-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
-rw-r--r--generic/tkText.c12
-rw-r--r--generic/tkTextTag.c4
-rw-r--r--macosx/tkMacOSXDefault.h3
-rw-r--r--macosx/tkMacOSXDialog.c4
-rw-r--r--unix/tkUnixDefault.h3
-rw-r--r--win/tkWinDefault.h3
6 files changed, 19 insertions, 10 deletions
diff --git a/generic/tkText.c b/generic/tkText.c
index eb9658e..a713e7e 100644
--- a/generic/tkText.c
+++ b/generic/tkText.c
@@ -215,14 +215,14 @@ static const Tk_OptionSpec optionSpecs[] = {
{TK_OPTION_BOOLEAN, "-setgrid", "setGrid", "SetGrid",
DEF_TEXT_SET_GRID, -1, Tk_Offset(TkText, setGrid), 0, 0, 0},
{TK_OPTION_PIXELS, "-spacing1", "spacing1", "Spacing",
- NULL, -1, Tk_Offset(TkText, spacing1),
- TK_OPTION_NULL_OK, 0 , TK_TEXT_LINE_GEOMETRY },
+ DEF_TEXT_SPACING1, -1, Tk_Offset(TkText, spacing1),
+ 0, 0 , TK_TEXT_LINE_GEOMETRY },
{TK_OPTION_PIXELS, "-spacing2", "spacing2", "Spacing",
- NULL, -1, Tk_Offset(TkText, spacing2),
- TK_OPTION_NULL_OK, 0 , TK_TEXT_LINE_GEOMETRY },
+ DEF_TEXT_SPACING2, -1, Tk_Offset(TkText, spacing2),
+ 0, 0 , TK_TEXT_LINE_GEOMETRY },
{TK_OPTION_PIXELS, "-spacing3", "spacing3", "Spacing",
- NULL, -1, Tk_Offset(TkText, spacing3),
- TK_OPTION_NULL_OK, 0 , TK_TEXT_LINE_GEOMETRY },
+ DEF_TEXT_SPACING3, -1, Tk_Offset(TkText, spacing3),
+ 0, 0 , TK_TEXT_LINE_GEOMETRY },
{TK_OPTION_CUSTOM, "-startline", NULL, NULL,
NULL, -1, Tk_Offset(TkText, start), TK_OPTION_NULL_OK,
&lineOption, TK_TEXT_LINE_RANGE},
diff --git a/generic/tkTextTag.c b/generic/tkTextTag.c
index a433905..3363d25 100644
--- a/generic/tkTextTag.c
+++ b/generic/tkTextTag.c
@@ -45,10 +45,10 @@ static const Tk_OptionSpec tagOptionSpecs[] = {
NULL, -1, Tk_Offset(TkTextTag, bgStipple), TK_OPTION_NULL_OK, 0, 0},
{TK_OPTION_PIXELS, "-borderwidth", NULL, NULL,
NULL, Tk_Offset(TkTextTag, borderWidthPtr), Tk_Offset(TkTextTag, borderWidth),
- TK_OPTION_DONT_SET_DEFAULT|TK_OPTION_NULL_OK, 0, 0},
+ TK_OPTION_NULL_OK|TK_OPTION_DONT_SET_DEFAULT, 0, 0},
{TK_OPTION_STRING, "-elide", NULL, NULL,
NULL, -1, Tk_Offset(TkTextTag, elideString),
- TK_OPTION_DONT_SET_DEFAULT|TK_OPTION_NULL_OK, 0, 0},
+ TK_OPTION_NULL_OK|TK_OPTION_DONT_SET_DEFAULT, 0, 0},
{TK_OPTION_BITMAP, "-fgstipple", NULL, NULL,
NULL, -1, Tk_Offset(TkTextTag, fgStipple), TK_OPTION_NULL_OK, 0, 0},
{TK_OPTION_FONT, "-font", NULL, NULL,
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
diff --git a/unix/tkUnixDefault.h b/unix/tkUnixDefault.h
index 62e3fec..d214aa5 100644
--- a/unix/tkUnixDefault.h
+++ b/unix/tkUnixDefault.h
@@ -494,6 +494,9 @@
#define DEF_TEXT_SELECT_FG_MONO WHITE
#define DEF_TEXT_SELECT_RELIEF "raised"
#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/win/tkWinDefault.h b/win/tkWinDefault.h
index 3a8ce9b..c52cc4d 100644
--- a/win/tkWinDefault.h
+++ b/win/tkWinDefault.h
@@ -497,6 +497,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"