summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpatthoyts <patthoyts@users.sourceforge.net>2007-09-04 23:21:22 (GMT)
committerpatthoyts <patthoyts@users.sourceforge.net>2007-09-04 23:21:22 (GMT)
commited4e01f66535acdac3cd68b707172137ad4e2a2a (patch)
tree7a2360c7635dd74ceca2421d6298c323730ab37b
parent20216235397d6f7d9fd2c42052b86c9e510237a5 (diff)
downloadtk-ed4e01f66535acdac3cd68b707172137ad4e2a2a.zip
tk-ed4e01f66535acdac3cd68b707172137ad4e2a2a.tar.gz
tk-ed4e01f66535acdac3cd68b707172137ad4e2a2a.tar.bz2
Backported the BASE_NO_TK_ICON patch to assist in creating tclkits
and/or basekits with corrent resources.
-rw-r--r--ChangeLog5
-rw-r--r--win/rc/tk_base.rc11
2 files changed, 15 insertions, 1 deletions
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>