From e0309015545d3beaab3e885dc0198de4a0fea135 Mon Sep 17 00:00:00 2001 From: hobbs Date: Wed, 1 Jun 2005 17:54:16 +0000 Subject: * win/tkWinInt.h: added private decls of Tk_GetEmbeddedMenuHWND, Tk_GetMenuHWND, TkWinCleanupContainerList, and TkpWmGetState to that are used across source files. --- ChangeLog | 4 ++++ win/tkWinInt.h | 12 ++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8da5c92..0c8adae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2005-06-01 Jeff Hobbs + * win/tkWinInt.h: added private decls of Tk_GetEmbeddedMenuHWND, + Tk_GetMenuHWND, TkWinCleanupContainerList, and TkpWmGetState to + that are used across source files. + * win/tkWinX.c (Tk_ResetUserInactiveTime): cast to squelch compiler warning. diff --git a/win/tkWinInt.h b/win/tkWinInt.h index 773807d..50bbd52 100644 --- a/win/tkWinInt.h +++ b/win/tkWinInt.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: tkWinInt.h,v 1.23 2005/01/31 04:08:32 chengyemao Exp $ + * RCS: @(#) $Id: tkWinInt.h,v 1.24 2005/06/01 17:54:16 hobbs Exp $ */ #ifndef _TKWININT @@ -173,8 +173,16 @@ EXTERN HICON TkWinGetIcon(Tk_Window tkw, DWORD iconsize); /* * Used by tkWinX.c on for certain system display change messages + * and cleanup up containers */ EXTERN void TkWinDisplayChanged(Display *display); +void TkWinCleanupContainerList(void); + +/* + * Used by tkWinWm.c for embedded menu handling. May become public. + */ +EXTERN HWND Tk_GetMenuHWND(Tk_Window tkwin); +EXTERN HWND Tk_GetEmbeddedMenuHWND(Tk_Window tkwin); /* * The following structure keeps track of whether we are using the @@ -232,5 +240,5 @@ long TkpWinToplevelIsControlledByWm _ANSI_ARGS_((TkWindow *winPtr)); long TkpWinToplevelMove _ANSI_ARGS_((TkWindow *winPtr, int x, int y)); long TkpWinToplevelOverrideRedirect _ANSI_ARGS_((TkWindow *winPtr, int reqValue)); void TkpWinToplevelDetachWindow _ANSI_ARGS_((TkWindow *winPtr)); +int TkpWmGetState _ANSI_ARGS_((TkWindow *winPtr)); #endif /* _TKWININT */ - -- cgit v0.12