*** generic/tk.h.orig	Sat Nov 20 00:35:43 1999
--- generic/tk.h	Sun Jan 16 17:43:01 2000
***************
*** 49,55 ****
  #define TK_RELEASE_SERIAL  3
  
  #define TK_VERSION "8.2"
! #define TK_PATCH_LEVEL "8.2.3"
  
  /*
   * The following definitions set up the proper options for Macintosh
--- 49,55 ----
  #define TK_RELEASE_SERIAL  3
  
  #define TK_VERSION "8.2"
! #define TK_PATCH_LEVEL "8.2.3+"
  
  /*
   * The following definitions set up the proper options for Macintosh
***************
*** 96,101 ****
--- 96,104 ----
  
  #ifdef XNQueryInputStyle
  #define TK_USE_INPUT_METHODS
+ #ifdef I18N_IMPROVE
+ #include <X11/Xlocale.h>
+ #endif /* I18N_IMPROVE */
  #endif
  
  /*
***************
*** 1167,1181 ****
  #define Tk_Main(argc, argv, proc) \
      Tk_MainEx(argc, argv, proc, Tcl_CreateInterp())
  
- char *Tk_InitStubs _ANSI_ARGS_((Tcl_Interp *interp, char *version, int exact));
- 
- #ifndef USE_TK_STUBS
- 
- #define Tk_InitStubs(interp, version, exact) \
-     Tcl_PkgRequire(interp, "Tk", version, exact)
- 
- #endif
- 
  
  /*
   *--------------------------------------------------------------
--- 1170,1175 ----
***************
*** 1208,1213 ****
--- 1202,1225 ----
   */
  
  #include "tkDecls.h"
+ 
+ /*
+  * Convenience declaration of Tk_InitStubs.
+  * This function is not *implemented* by the tcl library, so the storage
+  * class is neither DLLEXPORT nor DLLIMPORT
+  */
+ 
+ #undef TCL_STORAGE_CLASS
+ #define TCL_STORAGE_CLASS
+ 
+ EXTERN char *Tk_InitStubs _ANSI_ARGS_((Tcl_Interp *interp, char *version, int exact));
+ 
+ #ifndef USE_TK_STUBS
+ 
+ #define Tk_InitStubs(interp, version, exact) \
+     Tcl_PkgRequire(interp, "Tk", version, exact)
+ 
+ #endif
  
  /*
   * Tcl commands exported by Tk:
