diff options
| author | mdejong <mdejong> | 2002-05-27 19:49:32 (GMT) |
|---|---|---|
| committer | mdejong <mdejong> | 2002-05-27 19:49:32 (GMT) |
| commit | 6a4f24b098eed70f278a40916100f278bc7cf28a (patch) | |
| tree | c8d844d5c5f3ed027f756101f23a272695a9befb /generic | |
| parent | f2ec5d37bb3e769fe75dd9a0ebd90ed8e5799864 (diff) | |
| download | tk-6a4f24b098eed70f278a40916100f278bc7cf28a.zip tk-6a4f24b098eed70f278a40916100f278bc7cf28a.tar.gz tk-6a4f24b098eed70f278a40916100f278bc7cf28a.tar.bz2 | |
* generic/tkInt.decls: Add unix decl for TkpWmSetState.
* generic/tkIntPlatDecls.h: Regen.
* generic/tkStubInit.c: Regen.
* tests/wm.test: Test state changes between iconic,
normal, and withdrawn both before and after initial
mapping.
* unix/tkUnixWm.c (Tk_WmCmd, TkpWmSetState): Move
state change code into TkpWmSetState to more closely
match the Win32 implementation. No functional changes.
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkInt.decls | 6 | ||||
| -rw-r--r-- | generic/tkIntPlatDecls.h | 10 | ||||
| -rw-r--r-- | generic/tkStubInit.c | 3 |
3 files changed, 16 insertions, 3 deletions
diff --git a/generic/tkInt.decls b/generic/tkInt.decls index c874a26..64ea04b 100644 --- a/generic/tkInt.decls +++ b/generic/tkInt.decls @@ -9,7 +9,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.decls,v 1.25 2002/04/12 10:10:48 hobbs Exp $ +# RCS: @(#) $Id: tkInt.decls,v 1.26 2002/05/27 19:49:32 mdejong Exp $ library tk @@ -715,6 +715,10 @@ declare 11 unix { void TkFreeXId (TkDisplay *dispPtr) } +declare 12 unix { + int TkpWmSetState (TkWindow *winPtr, int state) +} + ############################ # Windows specific functions diff --git a/generic/tkIntPlatDecls.h b/generic/tkIntPlatDecls.h index 411fc0c..07e4e9b 100644 --- a/generic/tkIntPlatDecls.h +++ b/generic/tkIntPlatDecls.h @@ -9,7 +9,7 @@ * Copyright (c) 1998-1999 by Scriptics Corporation. * All rights reserved. * - * RCS: @(#) $Id: tkIntPlatDecls.h,v 1.11 2002/04/12 10:10:48 hobbs Exp $ + * RCS: @(#) $Id: tkIntPlatDecls.h,v 1.12 2002/05/27 19:49:32 mdejong Exp $ */ #ifndef _TKINTPLATDECLS @@ -61,6 +61,9 @@ EXTERN void TkWmCleanup _ANSI_ARGS_((TkDisplay * dispPtr)); EXTERN void TkSendCleanup _ANSI_ARGS_((TkDisplay * dispPtr)); /* 11 */ EXTERN void TkFreeXId _ANSI_ARGS_((TkDisplay * dispPtr)); +/* 12 */ +EXTERN int TkpWmSetState _ANSI_ARGS_((TkWindow * winPtr, + int state)); #endif /* UNIX */ #ifdef __WIN32__ /* 0 */ @@ -306,6 +309,7 @@ typedef struct TkIntPlatStubs { void (*tkWmCleanup) _ANSI_ARGS_((TkDisplay * dispPtr)); /* 9 */ void (*tkSendCleanup) _ANSI_ARGS_((TkDisplay * dispPtr)); /* 10 */ void (*tkFreeXId) _ANSI_ARGS_((TkDisplay * dispPtr)); /* 11 */ + int (*tkpWmSetState) _ANSI_ARGS_((TkWindow * winPtr, int state)); /* 12 */ #endif /* UNIX */ #ifdef __WIN32__ char * (*tkAlignImageData) _ANSI_ARGS_((XImage * image, int alignment, int bitOrder)); /* 0 */ @@ -477,6 +481,10 @@ extern TkIntPlatStubs *tkIntPlatStubsPtr; #define TkFreeXId \ (tkIntPlatStubsPtr->tkFreeXId) /* 11 */ #endif +#ifndef TkpWmSetState +#define TkpWmSetState \ + (tkIntPlatStubsPtr->tkpWmSetState) /* 12 */ +#endif #endif /* UNIX */ #ifdef __WIN32__ #ifndef TkAlignImageData diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c index 848fe96..cebe2ad 100644 --- a/generic/tkStubInit.c +++ b/generic/tkStubInit.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkStubInit.c,v 1.32 2002/04/12 10:10:48 hobbs Exp $ + * RCS: @(#) $Id: tkStubInit.c,v 1.33 2002/05/27 19:49:32 mdejong Exp $ */ #include "tkInt.h" @@ -290,6 +290,7 @@ TkIntPlatStubs tkIntPlatStubs = { TkWmCleanup, /* 9 */ TkSendCleanup, /* 10 */ TkFreeXId, /* 11 */ + TkpWmSetState, /* 12 */ #endif /* UNIX */ #ifdef __WIN32__ TkAlignImageData, /* 0 */ |