summaryrefslogtreecommitdiffstats
path: root/generic/tkInt.h
diff options
context:
space:
mode:
authorhobbs <hobbs>2004-10-05 22:27:25 (GMT)
committerhobbs <hobbs>2004-10-05 22:27:25 (GMT)
commit7ab5ea85960517b81f0466e0121003ff45e98369 (patch)
tree13c1b1ed9de46677032e5133c6477bf34437d5e8 /generic/tkInt.h
parent71ccd83260b9cb9ed67dc38726c9cbcb90991fcd (diff)
downloadtk-7ab5ea85960517b81f0466e0121003ff45e98369.zip
tk-7ab5ea85960517b81f0466e0121003ff45e98369.tar.gz
tk-7ab5ea85960517b81f0466e0121003ff45e98369.tar.bz2
Backport of 8.5 wm iconphoto that added support for Tk photo
* generic/tkInt.h (TkDisplay): images as titlebar icons. TIP #159 * win/tkWinWm.c (WmIconphotoCmd): wm iconphoto ?-default? image1 ... * macosx/tkMacOSXWm.c (WmIconphotoCmd): Implemented for Win/Unix, * unix/tkUnixWm.c (WmIconphotoCmd): stubbed out for OS X. * tests/wm.test, tests/unixWm.test, tests/winWm.test: [Bug 815751]
Diffstat (limited to 'generic/tkInt.h')
-rw-r--r--generic/tkInt.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/generic/tkInt.h b/generic/tkInt.h
index 4cf39d5..72782ed 100644
--- a/generic/tkInt.h
+++ b/generic/tkInt.h
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: $Id: tkInt.h,v 1.56.2.1 2003/10/13 03:30:05 hobbs Exp $
+ * RCS: $Id: tkInt.h,v 1.56.2.2 2004/10/05 22:27:26 hobbs Exp $
*/
#ifndef _TKINT
@@ -506,6 +506,9 @@ typedef struct TkDisplay {
* defined in below. */
TkCaret caret; /* information about the caret for this
* display. This is not a pointer. */
+
+ int iconDataSize; /* size of default iconphoto image data */
+ unsigned char *iconDataPtr; /* default iconphoto image data, if set */
} TkDisplay;
/*