win/Makefile.in Use tktest86.dll for all tests.

win/tkWinInt.h      mark various functions MODULE_SCOPE
generic/tkInt.decls make TkWinChildProc available in private
    stub table. [Bug #220600] and [Bug #220690].
generic/tkIntPlatDecls.h (regenerated)
generic/tkStubInit.c (regenerated)

1 files changed, 8 insertions, 16 deletions

diff --git a/win/tkWinInt.h b/win/tkWinInt.h
index 469d6e9..d99b2f9 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.32 2008/12/10 05:02:52 das Exp $
+ * RCS: @(#) $Id: tkWinInt.h,v 1.33 2009/12/02 21:16:45 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.
@@ -215,7 +207,7 @@ typedef struct TkWinProcs {
     int (WINAPI *getClassName)(HWND hwnd, LPTSTR lpClassName, int nMaxCount);
 } TkWinProcs;
 
-EXTERN TkWinProcs *tkWinProcs;
+MODULE_SCOPE TkWinProcs *tkWinProcs;
 
 #undef TCL_STORAGE_CLASS
 #define TCL_STORAGE_CLASS DLLIMPORT
@@ -225,9 +217,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.