summaryrefslogtreecommitdiffstats
path: root/win/tkWinInt.h
diff options
context:
space:
mode:
authornijtmans <nijtmans>2009-12-02 22:20:01 (GMT)
committernijtmans <nijtmans>2009-12-02 22:20:01 (GMT)
commit11451aec4915dc62cc84ee9caf897dc10818e8c9 (patch)
treea187e4ac515a9eb25c2ee05791fd6a2c2347b089 /win/tkWinInt.h
parent87bdd529d677fe0457e68a25ca129ffd59973fab (diff)
downloadtk-11451aec4915dc62cc84ee9caf897dc10818e8c9.zip
tk-11451aec4915dc62cc84ee9caf897dc10818e8c9.tar.gz
tk-11451aec4915dc62cc84ee9caf897dc10818e8c9.tar.bz2
doc/GetHINSTANCE.3 correct mentioned header file
make TkWinChildProc available in private stub table. [Bug #220600] and [Bug #220690].
Diffstat (limited to 'win/tkWinInt.h')
-rw-r--r--win/tkWinInt.h22
1 files changed, 7 insertions, 15 deletions
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.