tk.h   tk.h 
skipping to change at line 15 skipping to change at line 15
* module itself. * module itself.
* *
* Copyright (c) 1989-1994 The Regents of the University of California. * Copyright (c) 1989-1994 The Regents of the University of California.
* Copyright (c) 1994 The Australian National University. * Copyright (c) 1994 The Australian National University.
* Copyright (c) 1994-1998 Sun Microsystems, Inc. * Copyright (c) 1994-1998 Sun Microsystems, Inc.
* Copyright (c) 1998-2000 Ajuba Solutions. * Copyright (c) 1998-2000 Ajuba Solutions.
* *
* See the file "license.terms" for information on usage and redistribution of * See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES. * this file, and for a DISCLAIMER OF ALL WARRANTIES.
* *
* RCS: @(#) $Id: tk.h,v 1.109.2.7 2008/10/10 18:25:10 dgp Exp $ * RCS: @(#) $Id: tk.h,v 1.109.2.10 2008/12/21 21:02:58 dgp Exp $
*/ */
#ifndef _TK #ifndef _TK
#define _TK #define _TK
#include <tcl.h> #include <tcl.h>
#if (TCL_MAJOR_VERSION != 8) || (TCL_MINOR_VERSION != 5) #if (TCL_MAJOR_VERSION != 8) || (TCL_MINOR_VERSION != 5)
# error Tk 8.5 must be compiled with tcl.h from Tcl 8.5 # error Tk 8.5 must be compiled with tcl.h from Tcl 8.5
#endif #endif
skipping to change at line 56 skipping to change at line 56
* unix/tk.spec (1 LOC patch) * unix/tk.spec (1 LOC patch)
* win/tcl.m4 (not patchlevel) * win/tcl.m4 (not patchlevel)
* *
* You may also need to update some of these files when the numbers change for * You may also need to update some of these files when the numbers change for
* the version of Tcl that this release of Tk is compiled against. * the version of Tcl that this release of Tk is compiled against.
*/ */
#define TK_MAJOR_VERSION 8 #define TK_MAJOR_VERSION 8
#define TK_MINOR_VERSION 5 #define TK_MINOR_VERSION 5
#define TK_RELEASE_LEVEL TCL_FINAL_RELEASE #define TK_RELEASE_LEVEL TCL_FINAL_RELEASE
#define TK_RELEASE_SERIAL 5 #define TK_RELEASE_SERIAL 6
#define TK_VERSION "8.5" #define TK_VERSION "8.5"
#define TK_PATCH_LEVEL "8.5.5" #define TK_PATCH_LEVEL "8.5.6"
/* /*
* A special definition used to allow this header file to be included from * A special definition used to allow this header file to be included from
* windows or mac resource files so that they can obtain version informatio n. * windows or mac resource files so that they can obtain version informatio n.
* RC_INVOKED is defined by default by the windows RC tool and manually set * RC_INVOKED is defined by default by the windows RC tool and manually set
* for macintosh. * for macintosh.
* *
* Resource compilers don't like all the C stuff, like typedefs and procedu re * Resource compilers don't like all the C stuff, like typedefs and procedu re
* declarations, that occur below, so block them out. * declarations, that occur below, so block them out.
*/ */
skipping to change at line 723 skipping to change at line 723
#define Tk_IsMapped(tkwin) \ #define Tk_IsMapped(tkwin) \
(((Tk_FakeWin *) (tkwin))->flags & TK_MAPPED) (((Tk_FakeWin *) (tkwin))->flags & TK_MAPPED)
#define Tk_IsTopLevel(tkwin) \ #define Tk_IsTopLevel(tkwin) \
(((Tk_FakeWin *) (tkwin))->flags & TK_TOP_LEVEL) (((Tk_FakeWin *) (tkwin))->flags & TK_TOP_LEVEL)
#define Tk_HasWrapper(tkwin) \ #define Tk_HasWrapper(tkwin) \
(((Tk_FakeWin *) (tkwin))->flags & TK_HAS_WRAPPER) (((Tk_FakeWin *) (tkwin))->flags & TK_HAS_WRAPPER)
#define Tk_WinManaged(tkwin) \ #define Tk_WinManaged(tkwin) \
(((Tk_FakeWin *) (tkwin))->flags & TK_WIN_MANAGED) (((Tk_FakeWin *) (tkwin))->flags & TK_WIN_MANAGED)
#define Tk_TopWinHierarchy(tkwin) \ #define Tk_TopWinHierarchy(tkwin) \
(((Tk_FakeWin *) (tkwin))->flags & TK_TOP_HIERARCHY) (((Tk_FakeWin *) (tkwin))->flags & TK_TOP_HIERARCHY)
#define Tk_IsManageable(tkwin) \
(((Tk_FakeWin *) (tkwin))->flags & TK_WM_MANAGEABLE)
#define Tk_ReqWidth(tkwin) (((Tk_FakeWin *) (tkwin))->reqWidth) #define Tk_ReqWidth(tkwin) (((Tk_FakeWin *) (tkwin))->reqWidth)
#define Tk_ReqHeight(tkwin) (((Tk_FakeWin *) (tkwin))->reqHeight) #define Tk_ReqHeight(tkwin) (((Tk_FakeWin *) (tkwin))->reqHeight)
/* Tk_InternalBorderWidth is deprecated */ /* Tk_InternalBorderWidth is deprecated */
#define Tk_InternalBorderWidth(tkwin) \ #define Tk_InternalBorderWidth(tkwin) \
(((Tk_FakeWin *) (tkwin))->internalBorderLeft) (((Tk_FakeWin *) (tkwin))->internalBorderLeft)
#define Tk_InternalBorderLeft(tkwin) \ #define Tk_InternalBorderLeft(tkwin) \
(((Tk_FakeWin *) (tkwin))->internalBorderLeft) (((Tk_FakeWin *) (tkwin))->internalBorderLeft)
#define Tk_InternalBorderRight(tkwin) \ #define Tk_InternalBorderRight(tkwin) \
(((Tk_FakeWin *) (tkwin))->internalBorderRight) (((Tk_FakeWin *) (tkwin))->internalBorderRight)
#define Tk_InternalBorderTop(tkwin) \ #define Tk_InternalBorderTop(tkwin) \
skipping to change at line 858 skipping to change at line 860
* TK_HAS_WRAPPER 1 means that this window has a wrapper windo w * TK_HAS_WRAPPER 1 means that this window has a wrapper windo w
* TK_WIN_MANAGED 1 means that this window is a child of the r oot * TK_WIN_MANAGED 1 means that this window is a child of the r oot
* window, and is managed by the window manager . * window, and is managed by the window manager .
* TK_TOP_HIERARCHY 1 means this window is at the top of a physi cal * TK_TOP_HIERARCHY 1 means this window is at the top of a physi cal
* window hierarchy within this process, i.e. t he * window hierarchy within this process, i.e. t he
* window's parent either doesn't exist or is n ot * window's parent either doesn't exist or is n ot
* owned by this Tk application. * owned by this Tk application.
* TK_PROP_PROPCHANGE 1 means that PropertyNotify events in the * TK_PROP_PROPCHANGE 1 means that PropertyNotify events in the
* window's children should propagate up to thi s * window's children should propagate up to thi s
* window. * window.
* TK_WM_MANAGEABLE 1 marks a window as capable of being convert
ed
* into a toplevel using [wm manage].
*/ */
#define TK_MAPPED 1 #define TK_MAPPED 1
#define TK_TOP_LEVEL 2 #define TK_TOP_LEVEL 2
#define TK_ALREADY_DEAD 4 #define TK_ALREADY_DEAD 4
#define TK_NEED_CONFIG_NOTIFY 8 #define TK_NEED_CONFIG_NOTIFY 8
#define TK_GRAB_FLAG 0x10 #define TK_GRAB_FLAG 0x10
#define TK_CHECKED_IC 0x20 #define TK_CHECKED_IC 0x20
#define TK_DONT_DESTROY_WINDOW 0x40 #define TK_DONT_DESTROY_WINDOW 0x40
#define TK_WM_COLORMAP_WINDOW 0x80 #define TK_WM_COLORMAP_WINDOW 0x80
skipping to change at line 879 skipping to change at line 883
#define TK_CONTAINER 0x200 #define TK_CONTAINER 0x200
#define TK_BOTH_HALVES 0x400 #define TK_BOTH_HALVES 0x400
#define TK_DEFER_MODAL 0x800 #define TK_DEFER_MODAL 0x800
#define TK_WRAPPER 0x1000 #define TK_WRAPPER 0x1000
#define TK_REPARENTED 0x2000 #define TK_REPARENTED 0x2000
#define TK_ANONYMOUS_WINDOW 0x4000 #define TK_ANONYMOUS_WINDOW 0x4000
#define TK_HAS_WRAPPER 0x8000 #define TK_HAS_WRAPPER 0x8000
#define TK_WIN_MANAGED 0x10000 #define TK_WIN_MANAGED 0x10000
#define TK_TOP_HIERARCHY 0x20000 #define TK_TOP_HIERARCHY 0x20000
#define TK_PROP_PROPCHANGE 0x40000 #define TK_PROP_PROPCHANGE 0x40000
#define TK_WM_MANAGEABLE 0x80000
/* /*
*-------------------------------------------------------------- *--------------------------------------------------------------
* *
* Procedure prototypes and structures used for defining new canvas items: * Procedure prototypes and structures used for defining new canvas items:
* *
*-------------------------------------------------------------- *--------------------------------------------------------------
*/ */
typedef enum { typedef enum {
TK_STATE_NULL = -1, TK_STATE_ACTIVE, TK_STATE_DISABLED, TK_STATE_NULL = -1, TK_STATE_ACTIVE, TK_STATE_DISABLED,
 End of changes. 6 change blocks. 
3 lines changed or deleted 9 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/