From 872526db4a816ba2cfc1ba9d59a89973f9f70759 Mon Sep 17 00:00:00 2001
From: patthoyts <patthoyts@noemail.net>
Date: Tue, 4 Sep 2007 23:21:21 +0000
Subject: Backported the BASE_NO_TK_ICON patch to assist in creating tclkits
 and/or basekits with corrent resources.

FossilOrigin-Name: 7f01ef7a7be66fe8ab2679c3b395b9c776c88b14
---
 ChangeLog         |  5 +++++
 win/rc/tk_base.rc | 11 ++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 8bb7fde..585539a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-05  Pat Thoyts  <patthoyts@users.sourceforge.net>
+
+	* win/rc/tk_base.rc: Backported the BASE_NO_TK_ICON patch to assist in
+	creating tclkits and/or basekits with corrent resources.
+
 2007-09-04  Pat Thoyts  <patthoyts@users.sourceforge.net>
 
 	* tests/wm.test: -transparentcolor added to windows wm attributes tests
diff --git a/win/rc/tk_base.rc b/win/rc/tk_base.rc
index 7a8a2eb..7c326bd 100644
--- a/win/rc/tk_base.rc
+++ b/win/rc/tk_base.rc
@@ -1,13 +1,22 @@
-// RCS: @(#) $Id: tk_base.rc,v 1.2 2000/10/31 01:28:27 davidg Exp $
+// RCS: @(#) $Id: tk_base.rc,v 1.2.8.1 2007/09/04 23:21:22 patthoyts Exp $
 //
 //  Base resources needed by Tk whether it's a DLL or a static library.
 //
 
+#include <windows.h>
+
 //
 //  Tk Icon
 //
+//  The BASE_NO_TK_ICON symbol can be defined to avoid
+//  creating an icon named "tk" in this resource file.
+//  The user can then create another icon named tk in
+//  another resource file and link both resource files.
+//  Tk will then use the custom icon instead of tk.ico.
 
+#ifndef BASE_NO_TK_ICON
 tk                      ICON    DISCARDABLE     "tk.ico"
+#endif
 
 #include <dlgs.h>
 
-- 
cgit v0.12