As requested by Christian Werner/François Vogel and others: Undo many None -> 0 changes, in order to reduce the probability of merge conflicts with other branches.

Remark: Many usages of "None" in Tk are wrong, "NULL" should be used in many places where pointers are referenced in stead of XID's. Those places are corrected.

5 files changed, 10 insertions, 10 deletions

diff --git a/macosx/tkMacOSXDefault.h b/macosx/tkMacOSXDefault.h
index b749673..a0b6a79 100644
--- a/macosx/tkMacOSXDefault.h
+++ b/macosx/tkMacOSXDefault.h
@@ -37,7 +37,7 @@
 #define ACTIVE_BG		"systemButtonFacePressed"
 #define ACTIVE_FG		"systemPushButtonPressedText"
 #define SELECT_BG		"systemHighlight"
-#define SELECT_FG		None
+#define SELECT_FG		NULL
 #define INACTIVE_SELECT_BG	"systemHighlightSecondary"
 #define TROUGH			"#c3c3c3"
 #define INDICATOR		"#b03060"
@@ -282,7 +282,7 @@
 #define DEF_MENU_ENTRY_ACTIVE_FG	NULL
 #define DEF_MENU_ENTRY_ACCELERATOR	NULL
 #define DEF_MENU_ENTRY_BG		NULL
-#define DEF_MENU_ENTRY_BITMAP		None
+#define DEF_MENU_ENTRY_BITMAP		NULL
 #define DEF_MENU_ENTRY_COLUMN_BREAK	"0"
 #define DEF_MENU_ENTRY_COMMAND		NULL
 #define DEF_MENU_ENTRY_COMPOUND		"none"
diff --git a/macosx/tkMacOSXDialog.c b/macosx/tkMacOSXDialog.c
index e828b39..fd1ec22 100644
--- a/macosx/tkMacOSXDialog.c
+++ b/macosx/tkMacOSXDialog.c
@@ -1950,7 +1950,7 @@ FontchooserParentEventHandler(
     if (eventPtr->type == DestroyNotify) {
 	Tk_DeleteEventHandler(fcdPtr->parent, StructureNotifyMask,
 		FontchooserParentEventHandler, fcdPtr);
-	fcdPtr->parent = None;
+	fcdPtr->parent = NULL;
 	FontchooserHideCmd(NULL, NULL, 0, NULL);
     }
 }
diff --git a/macosx/tkMacOSXEmbed.c b/macosx/tkMacOSXEmbed.c
index f6c32b3..589475c 100644
--- a/macosx/tkMacOSXEmbed.c
+++ b/macosx/tkMacOSXEmbed.c
@@ -494,7 +494,7 @@ TkMacOSXContainerId(
 	}
     }
     Tcl_Panic("TkMacOSXContainerId couldn't find window");
-    return None;
+    return NULL;
 }
 
 /*
@@ -530,8 +530,8 @@ TkMacOSXGetHostToplevel(
      * TODO: Here we should handle out of process embedding.
      */
 
-    if (contWinPtr == NULL) {
-	return None;
+    if (!contWinPtr) {
+	return NULL;
     }
     return TkMacOSXGetHostToplevel(contWinPtr);
 }
diff --git a/macosx/tkMacOSXMenu.c b/macosx/tkMacOSXMenu.c
index ec32a78..8f3be9f 100644
--- a/macosx/tkMacOSXMenu.c
+++ b/macosx/tkMacOSXMenu.c
@@ -1481,10 +1481,10 @@ TkpMenuInit(void)
 #undef observe
 
     [NSMenuItem setUsesUserKeyEquivalents:NO];
-    tkColPtr = TkpGetColor(None, DEF_MENU_BG_COLOR);
+    tkColPtr = TkpGetColor(NULL, DEF_MENU_BG_COLOR);
     defaultBg = tkColPtr->color.pixel;
     ckfree(tkColPtr);
-    tkColPtr = TkpGetColor(None, DEF_MENU_FG);
+    tkColPtr = TkpGetColor(NULL, DEF_MENU_FG);
     defaultFg = tkColPtr->color.pixel;
     ckfree(tkColPtr);
 
diff --git a/macosx/tkMacOSXScrlbr.c b/macosx/tkMacOSXScrlbr.c
index d1287bb..688829d 100644
--- a/macosx/tkMacOSXScrlbr.c
+++ b/macosx/tkMacOSXScrlbr.c
@@ -119,8 +119,8 @@ TkpCreateScrollbar(
 
     MacScrollbar *scrollPtr = (MacScrollbar *)ckalloc(sizeof(MacScrollbar));
 
-    scrollPtr->troughGC = None;
-    scrollPtr->copyGC = None;
+    scrollPtr->troughGC = NULL;
+    scrollPtr->copyGC = NULL;
     scrollPtr->info = defaultInfo;
     scrollPtr->buttonDown = false;