tkWindow.c/tkStubInit.c adapted from stub changes in Tcl

tkArgv.c      make defaultTable const
tkScrollbar.c Store default for "-with" in static non-const memory
tkWinInt.h        make tkWinProcs const, and 5
tkWinX.c          procs MODULE_SCOPE
tkWinColor.c      make sysColors const
tkWinKey.c        make keymap const
tkWinScrlbr.c     Simplify copying of "-with" default value.
tkUnixWm.c       make TkSetTransientFor static
tests/textImage.test  textImage-1.13 depends on hash-order

1 files changed, 17 insertions, 22 deletions

diff --git a/win/tkWinInt.h b/win/tkWinInt.h
index 90d68bb..b0fd454 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.34 2010/01/14 22:05:54 nijtmans Exp $
+ * RCS: @(#) $Id: tkWinInt.h,v 1.35 2010/02/16 21:12:56 nijtmans Exp $
  */
 
 #ifndef _TKWININT
@@ -158,28 +158,28 @@ MODULE_SCOPE int tkpWinBltModes[];
  * tkWinX.c:GenerateXEvent and tkWinClipboard.c:UpdateClipboard
  */
 
-EXTERN void		TkWinUpdatingClipboard(int mode);
+MODULE_SCOPE void TkWinUpdatingClipboard(int mode);
 
 /*
  * Used by tkWinDialog.c to associate the right icon with tk_messageBox
  */
 
-EXTERN HICON		TkWinGetIcon(Tk_Window tkw, DWORD iconsize);
+MODULE_SCOPE 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);
+MODULE_SCOPE void TkWinDisplayChanged(Display *display);
 MODULE_SCOPE 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);
+MODULE_SCOPE HWND Tk_GetMenuHWND(Tk_Window tkwin);
+MODULE_SCOPE HWND Tk_GetEmbeddedMenuHWND(Tk_Window tkwin);
 
 /*
  * The following structure keeps track of whether we are using the multi-byte
@@ -193,24 +193,19 @@ EXTERN HWND		Tk_GetEmbeddedMenuHWND(Tk_Window tkwin);
 
 typedef struct TkWinProcs {
     int useWide;
-    LRESULT (WINAPI *callWindowProc)(WNDPROC lpPrevWndFunc, HWND hWnd,
-	    UINT Msg, WPARAM wParam, LPARAM lParam);
-    LRESULT (WINAPI *defWindowProc)(HWND hWnd, UINT Msg, WPARAM wParam,
-	    LPARAM lParam);
-    ATOM (WINAPI *registerClass)(const WNDCLASS *lpWndClass);
-    BOOL (WINAPI *setWindowText)(HWND hWnd, LPCTSTR lpString);
-    HWND (WINAPI *createWindowEx)(DWORD dwExStyle, LPCTSTR lpClassName,
-	    LPCTSTR lpWindowName, DWORD dwStyle, int x, int y,
-	    int nWidth, int nHeight, HWND hWndParent, HMENU hMenu,
-	    HINSTANCE hInstance, LPVOID lpParam);
-    BOOL (WINAPI *insertMenu)(HMENU hMenu, UINT uPosition, UINT uFlags,
-	    UINT uIDNewItem, LPCTSTR lpNewItem);
-    int (WINAPI *getWindowText)(HWND hWnd, LPCTSTR lpString, int nMaxCount);
-    HWND (WINAPI *findWindow)(LPCTSTR lpClassName, LPCTSTR lpWindowName);
-    int (WINAPI *getClassName)(HWND hwnd, LPTSTR lpClassName, int nMaxCount);
+    LRESULT (WINAPI *callWindowProc)(WNDPROC, HWND, UINT, WPARAM, LPARAM);
+    LRESULT (WINAPI *defWindowProc)(HWND, UINT, WPARAM, LPARAM);
+    ATOM (WINAPI *registerClass)(const WNDCLASS *);
+    BOOL (WINAPI *setWindowText)(HWND, LPCTSTR);
+    HWND (WINAPI *createWindowEx)(DWORD, LPCTSTR, LPCTSTR, DWORD, int, int,
+	    int, int, HWND, HMENU, HINSTANCE, LPVOID);
+    BOOL (WINAPI *insertMenu)(HMENU, UINT, UINT, UINT, LPCTSTR);
+    int (WINAPI *getWindowText)(HWND, LPCTSTR, int);
+    HWND (WINAPI *findWindow)(LPCTSTR, LPCTSTR);
+    int (WINAPI *getClassName)(HWND, LPTSTR, int);
 } TkWinProcs;
 
-MODULE_SCOPE TkWinProcs *tkWinProcs;
+MODULE_SCOPE const TkWinProcs *tkWinProcs;
 
 #undef TCL_STORAGE_CLASS
 #define TCL_STORAGE_CLASS DLLIMPORT