diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2007-09-08 16:13:45 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2007-09-08 16:13:45 (GMT) |
| commit | 94bc46d46cbcb986f2da2451a7e557fb6cfd017b (patch) | |
| tree | 5f23acee730c544b491aba77d49ce84b33d02279 /win/tkWinEmbed.c | |
| parent | dcf3897c755ed042d4b1b5b8481d5c83c2a928b4 (diff) | |
| download | tk-94bc46d46cbcb986f2da2451a7e557fb6cfd017b.zip tk-94bc46d46cbcb986f2da2451a7e557fb6cfd017b.tar.gz tk-94bc46d46cbcb986f2da2451a7e557fb6cfd017b.tar.bz2 | |
Assorted minor cleanups.
Diffstat (limited to 'win/tkWinEmbed.c')
| -rw-r--r-- | win/tkWinEmbed.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/win/tkWinEmbed.c b/win/tkWinEmbed.c index b8b0b1e..7322c7c 100644 --- a/win/tkWinEmbed.c +++ b/win/tkWinEmbed.c @@ -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: tkWinEmbed.c,v 1.31 2006/05/29 22:21:40 hobbs Exp $ + * RCS: @(#) $Id: tkWinEmbed.c,v 1.32 2007/09/08 16:13:45 dkf Exp $ */ #include "tkWinInt.h" @@ -240,12 +240,15 @@ TkpUseWindow( TkWindow *winPtr = (TkWindow *) tkwin; int id; HWND hwnd; +/* ThreadSpecificData *tsdPtr = (ThreadSpecificData *) Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); +*/ /* if (winPtr->window != None) { - Tcl_AppendResult(interp, "can't modify container after widget is created", NULL); + Tcl_AppendResult(interp, + "can't modify container after widget is created", NULL); return TCL_ERROR; } */ @@ -315,15 +318,15 @@ TkpUseWindow( winPtr->privatePtr = (struct TkWindowPrivate*) hwnd; winPtr->flags |= TK_EMBEDDED; - winPtr->flags &= (~(TK_MAPPED)); + winPtr->flags &= ~(TK_MAPPED); /* * Preserve the winPtr and create an idle handler to map the embedded * window. */ - Tcl_Preserve((ClientData)winPtr); - Tcl_DoWhenIdle(Tk_MapEmbeddedWindow,(ClientData)winPtr); + Tcl_Preserve((ClientData) winPtr); + Tcl_DoWhenIdle((Tcl_IdleProc*) Tk_MapEmbeddedWindow, (ClientData) winPtr); return TCL_OK; } @@ -386,6 +389,7 @@ TkpMakeContainer( ContainerEventProc, (ClientData) containerPtr); } +#if 0 /* *---------------------------------------------------------------------- * @@ -416,6 +420,7 @@ EmbeddedEventProc( EmbedWindowDeleted(winPtr); } } +#endif /* *---------------------------------------------------------------------- |