*** generic/tkInt.h.orig	Thu Jun 17 21:58:00 1999
--- generic/tkInt.h	Sun Jan 16 17:43:04 2000
***************
*** 482,487 ****
--- 482,500 ----
  
  #ifdef TK_USE_INPUT_METHODS
      XIM inputMethod;		/* Input method for this display */
+ #ifdef I18N_IMPROVE
+     Tcl_Encoding imEncoding;	/* Tcl encoding when the first Tcl
+ 				 * interp was created.
+ 				 * For encoding conversion from
+ 				 * XmbLookupString() to UTF.
+ 				 */
+     XIC lastFocusedIC;		/* The last focused input context on
+ 				 * the display.
+ 				 */
+ #ifdef XNDestroyCallback
+     XIMCallback destroyCallback;
+ #endif /* XNDestroyCallback */
+ #endif /* I18N_IMPROVE */
  #endif /* TK_USE_INPUT_METHODS */
      Tcl_HashTable winTable;	/* Maps from X window ids to TkWindow ptrs. */
  
***************
*** 985,993 ****
  EXTERN int		Tk_WmCmd _ANSI_ARGS_((ClientData clientData,
  			    Tcl_Interp *interp, int argc, char **argv));
  
- void	TkConsolePrint _ANSI_ARGS_((Tcl_Interp *interp,
- 			    int devId, char *buffer, long size));
- 
  EXTERN void		TkEventInit _ANSI_ARGS_((void));
  
  EXTERN int		TkCreateMenuCmd _ANSI_ARGS_((Tcl_Interp *interp));
--- 998,1003 ----
***************
*** 1002,1007 ****
--- 1012,1032 ----
   */
  EXTERN int		TkUnsupported1Cmd _ANSI_ARGS_((ClientData clientData,
  			    Tcl_Interp *interp, int argc, char **argv));
+ 
+ #if defined(TK_USE_INPUT_METHODS) && defined(I18N_IMPROVE)
+ EXTERN XIC		TkpCreateIC _ANSI_ARGS_((TkWindow *winPtr));
+ EXTERN void		TkpDestroyIC _ANSI_ARGS_((TkWindow *winPtr, int needDestroy));
+ EXTERN int		Tk_ImconfigureObjCmd _ANSI_ARGS_((ClientData clientData,
+ 			    Tcl_Interp *interp, int objc,
+ 			    Tcl_Obj *CONST objv[]));
+ #endif
+ 
+ # undef TCL_STORAGE_CLASS
+ # define TCL_STORAGE_CLASS
+ 
+ EXTERN int	TkConsoleInit _ANSI_ARGS_((Tcl_Interp *interp));
+ EXTERN void	TkConsolePrint _ANSI_ARGS_((Tcl_Interp *interp,
+ 			    int devId, char *buffer, long size));
  
  # undef TCL_STORAGE_CLASS
  # define TCL_STORAGE_CLASS DLLIMPORT
