diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | doc/GetHINSTANCE.3 | 6 | ||||
| -rw-r--r-- | generic/tkInt.decls | 17 | ||||
| -rw-r--r-- | generic/tkIntPlatDecls.h | 13 | ||||
| -rw-r--r-- | generic/tkStubInit.c | 3 | ||||
| -rw-r--r-- | win/tkWinInt.h | 22 |
6 files changed, 46 insertions, 23 deletions
@@ -1,3 +1,11 @@ +2009-12-02 Jan Nijtmans <nijtmans@users.sf.net> + + * doc/GetHINSTANCE.3 correct mentioned header file + * win/tkWinInt.h make TkWinChildProc available in private + * generic/tkInt.decls stub table. [Bug #220600] and [Bug #220690]. + * generic/tkIntPlatDecls.h (regenerated) + * generic/tkStubInit.c (regenerated) + 2009-11-25 Stuart Cassoff <stwo@users.sf.net> * unix/tcl.m4: [Patch 2892871]: Remove unneeded diff --git a/doc/GetHINSTANCE.3 b/doc/GetHINSTANCE.3 index 8942105..65f0da8 100644 --- a/doc/GetHINSTANCE.3 +++ b/doc/GetHINSTANCE.3 @@ -2,7 +2,7 @@ '\" Copyright (c) 1998-2000 by Scriptics Corporation. '\" All rights reserved. '\" -'\" RCS: @(#) $Id: GetHINSTANCE.3,v 1.2 2002/11/15 15:35:55 dkf Exp $ +'\" RCS: @(#) $Id: GetHINSTANCE.3,v 1.2.10.1 2009/12/02 22:20:01 nijtmans Exp $ '\" .so man.macros .TH Tk_GetHISTANCE 3 "" Tk "Tk Library Procedures" @@ -11,16 +11,14 @@ Tk_GetHINSTANCE \- retrieve the global application instance handle .SH SYNOPSIS .nf -\fB#include <tk.h>\fR +\fB#include <tkPlatDecls.h>\fR .sp HINSTANCE \fBTk_GetHINSTANCE\fR() .BE - .SH DESCRIPTION .PP \fBTk_GetHINSTANCE\fR returns the Windows application instance handle for the Tk application. This function is only available on Windows platforms. - .SH KEYWORDS identifier, instance diff --git a/generic/tkInt.decls b/generic/tkInt.decls index a254c26..cd0e324 100644 --- a/generic/tkInt.decls +++ b/generic/tkInt.decls @@ -10,9 +10,11 @@ # 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.44.2.2 2009/06/27 19:53:16 nijtmans Exp $ +# RCS: @(#) $Id: tkInt.decls,v 1.44.2.3 2009/12/02 22:20:01 nijtmans Exp $ library tk + +############################################################################## # Define the unsupported generic interfaces. @@ -568,7 +570,7 @@ declare 180 generic { char *TkSmoothPrintProc(ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr) } - + ############################################################################## # Define the platform specific internal Tcl interface. These functions are @@ -743,6 +745,13 @@ declare 35 win { int TkWinGetPlatformTheme(void) } +# new for 8.6 + +declare 36 win { + LRESULT CALLBACK TkWinChildProc(HWND hwnd, + UINT message, WPARAM wParam, LPARAM lParam) +} + ################################ # Aqua specific functions @@ -1630,3 +1639,7 @@ declare 90 aqua { declare 91 aqua { int XSync(Display *display, Bool flag) } + +# Local Variables: +# mode: tcl +# End: diff --git a/generic/tkIntPlatDecls.h b/generic/tkIntPlatDecls.h index e21516e..f7a50f9 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.29 2007/12/13 15:24:14 dgp Exp $ + * RCS: @(#) $Id: tkIntPlatDecls.h,v 1.29.2.1 2009/12/02 22:20:01 nijtmans Exp $ */ #ifndef _TKINTPLATDECLS @@ -224,6 +224,12 @@ EXTERN void TkWinSetHINSTANCE (HINSTANCE hInstance); /* 35 */ EXTERN int TkWinGetPlatformTheme (void); #endif +#ifndef TkWinChildProc_TCL_DECLARED +#define TkWinChildProc_TCL_DECLARED +/* 36 */ +EXTERN LRESULT CALLBACK TkWinChildProc (HWND hwnd, UINT message, + WPARAM wParam, LPARAM lParam); +#endif #endif /* WIN */ #ifdef MAC_OSX_TK /* AQUA */ #ifndef TkGenerateActivateEvents_TCL_DECLARED @@ -595,6 +601,7 @@ typedef struct TkIntPlatStubs { int (*tkWinGetPlatformId) (void); /* 33 */ void (*tkWinSetHINSTANCE) (HINSTANCE hInstance); /* 34 */ int (*tkWinGetPlatformTheme) (void); /* 35 */ + LRESULT (CALLBACK *tkWinChildProc) (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam); /* 36 */ #endif /* WIN */ #ifdef MAC_OSX_TK /* AQUA */ void (*tkGenerateActivateEvents) (TkWindow * winPtr, int active); /* 0 */ @@ -826,6 +833,10 @@ extern TkIntPlatStubs *tkIntPlatStubsPtr; #define TkWinGetPlatformTheme \ (tkIntPlatStubsPtr->tkWinGetPlatformTheme) /* 35 */ #endif +#ifndef TkWinChildProc +#define TkWinChildProc \ + (tkIntPlatStubsPtr->tkWinChildProc) /* 36 */ +#endif #endif /* WIN */ #ifdef MAC_OSX_TK /* AQUA */ #ifndef TkGenerateActivateEvents diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c index bf00408..5380f53 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.60.2.2 2009/06/27 19:53:16 nijtmans Exp $ + * RCS: @(#) $Id: tkStubInit.c,v 1.60.2.3 2009/12/02 22:20:01 nijtmans Exp $ */ #include "tkInt.h" @@ -380,6 +380,7 @@ TkIntPlatStubs tkIntPlatStubs = { TkWinGetPlatformId, /* 33 */ TkWinSetHINSTANCE, /* 34 */ TkWinGetPlatformTheme, /* 35 */ + TkWinChildProc, /* 36 */ #endif /* WIN */ #ifdef MAC_OSX_TK /* AQUA */ TkGenerateActivateEvents, /* 0 */ diff --git a/win/tkWinInt.h b/win/tkWinInt.h index aa35ed0..813c145 100644 --- a/win/tkWinInt.h +++ b/win/tkWinInt.h @@ -10,7 +10,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.31 2007/12/14 15:56:09 patthoyts Exp $ + * RCS: @(#) $Id: tkWinInt.h,v 1.31.2.1 2009/12/02 22:20:02 nijtmans Exp $ */ #ifndef _TKWININT @@ -128,8 +128,8 @@ typedef struct { * Win32 raster and BitBlt op modes. */ -extern int tkpWinRopModes[]; -extern int tkpWinBltModes[]; +MODULE_SCOPE int tkpWinRopModes[]; +MODULE_SCOPE int tkpWinBltModes[]; /* * The following defines are used with TkWinGetBorderPixels to get the extra 2 @@ -145,19 +145,11 @@ extern int tkpWinBltModes[]; #include "tkIntPlatDecls.h" -/* - * We need to specially add the TkWinChildProc because of the special - * prototype it has (doesn't fit into stubs schema) - */ - #ifdef BUILD_tk #undef TCL_STORAGE_CLASS #define TCL_STORAGE_CLASS DLLEXPORT #endif -EXTERN LRESULT CALLBACK TkWinChildProc(HWND hwnd, UINT message, - WPARAM wParam, LPARAM lParam); - /* * Special proc needed as tsd accessor function between * tkWinX.c:GenerateXEvent and tkWinClipboard.c:UpdateClipboard @@ -177,7 +169,7 @@ EXTERN HICON TkWinGetIcon(Tk_Window tkw, DWORD iconsize); */ EXTERN void TkWinDisplayChanged(Display *display); -void TkWinCleanupContainerList(void); +MODULE_SCOPE void TkWinCleanupContainerList(void); /* * Used by tkWinWm.c for embedded menu handling. May become public. @@ -223,9 +215,9 @@ EXTERN TkWinProcs *tkWinProcs; */ -extern Tcl_Encoding TkWinGetKeyInputEncoding(void); -extern Tcl_Encoding TkWinGetUnicodeEncoding(void); -extern void TkWinSetupSystemFonts(TkMainInfo *mainPtr); +MODULE_SCOPE Tcl_Encoding TkWinGetKeyInputEncoding(void); +MODULE_SCOPE Tcl_Encoding TkWinGetUnicodeEncoding(void); +MODULE_SCOPE void TkWinSetupSystemFonts(TkMainInfo *mainPtr); /* * Values returned by TkWinGetPlatformTheme. |