modified files to work with new windows Makefiles

6 files changed, 59 insertions, 29 deletions

diff --git a/generic/tkInt.decls b/generic/tkInt.decls
index 5c7693b..30157a6 100644
--- a/generic/tkInt.decls
+++ b/generic/tkInt.decls
@@ -9,7 +9,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # 
-# RCS: @(#) $Id: tkInt.decls,v 1.7 1999/05/25 01:31:05 stanton Exp $
+# RCS: @(#) $Id: tkInt.decls,v 1.8 1999/06/16 20:11:28 surles Exp $
 
 library tk
 
@@ -1501,6 +1501,10 @@ declare 103 win {
     Status XStringListToTextProperty(char** list, int count, \
 	    XTextProperty* text_prop_return)
 }
+declare 104 win {
+    void XDrawLine (Display* d, Drawable dr, GC g, int x1, int y1, \
+	    int x2, int y2)
+}
 
 # X functions for Mac
 
@@ -1873,3 +1877,7 @@ declare 80 mac {
 declare 81 mac {
     void  XForceScreenSaver(Display* display, int mode)
 }
+declare 82 mac {
+    void XDrawLine (Display* d, Drawable dr, GC g, int x1, int y1, \
+	    int x2, int y2)
+}
diff --git a/generic/tkInt.h b/generic/tkInt.h
index 6c6dc42..427262f 100644
--- a/generic/tkInt.h
+++ b/generic/tkInt.h
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: $Id: tkInt.h,v 1.13 1999/04/28 18:18:06 redman Exp $ 
+ * RCS: $Id: tkInt.h,v 1.14 1999/06/16 20:11:28 surles Exp $ 
  */
 
 #ifndef _TKINT
@@ -1000,6 +1000,31 @@ EXTERN int		TkpTestembedCmd _ANSI_ARGS_((ClientData clientData,
 /* 
  * Unsupported commands.
  */
+
+typedef struct TkTextIndex TkTextIndex;
+typedef struct TkTextSegment TkTextSegment;
+typedef struct TkText TkText;
+typedef struct TkTextBTree *TkTextBTree;
+
+EXTERN int		TkTextGetIndex _ANSI_ARGS_((Tcl_Interp *interp,
+			    TkText *textPtr, char *string,
+			    TkTextIndex *indexPtr));
+EXTERN void		TkTextIndexBackBytes _ANSI_ARGS_((
+			    CONST TkTextIndex *srcPtr, int count,
+			    TkTextIndex *dstPtr));
+EXTERN void		TkTextIndexForwBytes _ANSI_ARGS_((
+			    CONST TkTextIndex *srcPtr, int count,
+			    TkTextIndex *dstPtr));
+EXTERN TkTextIndex *	TkTextMakeCharIndex _ANSI_ARGS_((TkTextBTree tree,
+			    int lineIndex, int charIndex,
+			    TkTextIndex *indexPtr));
+EXTERN TkTextIndex *	TkTextMakeByteIndex _ANSI_ARGS_((TkTextBTree tree,
+			    int lineIndex, int byteIndex,
+			    TkTextIndex *indexPtr));
+EXTERN void		TkTextPrintIndex _ANSI_ARGS_((
+			    CONST TkTextIndex *indexPtr, char *string));
+EXTERN TkTextSegment *	TkTextSetMark _ANSI_ARGS_((TkText *textPtr, char *name,
+			    TkTextIndex *indexPtr));
 EXTERN int		TkUnsupported1Cmd _ANSI_ARGS_((ClientData clientData,
 			    Tcl_Interp *interp, int argc, char **argv));
 
diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h
index a720d5a..8ad8fd2 100644
--- a/generic/tkIntXlibDecls.h
+++ b/generic/tkIntXlibDecls.h
@@ -9,7 +9,7 @@
  * Copyright (c) 1998-1999 by Scriptics Corporation.
  * All rights reserved.
  *
- * RCS: @(#) $Id: tkIntXlibDecls.h,v 1.9 1999/06/02 18:15:54 stanton Exp $
+ * RCS: @(#) $Id: tkIntXlibDecls.h,v 1.10 1999/06/16 20:11:28 surles Exp $
  */
 
 #ifndef _TKINTXLIBDECLS
@@ -351,6 +351,9 @@ EXTERN void		XSetWMClientMachine _ANSI_ARGS_((Display* display,
 /* 103 */
 EXTERN Status		XStringListToTextProperty _ANSI_ARGS_((char** list, 
 				int count, XTextProperty* text_prop_return));
+/* 104 */
+EXTERN void		XDrawLine _ANSI_ARGS_((Display* d, Drawable dr, GC g, 
+				int x1, int y1, int x2, int y2));
 #endif /* __WIN32__ */
 #ifdef MAC_TCL
 /* Slot 0 is reserved */
@@ -605,6 +608,9 @@ EXTERN void		XDrawSegments _ANSI_ARGS_((Display * display,
 /* 81 */
 EXTERN void		XForceScreenSaver _ANSI_ARGS_((Display* display, 
 				int mode));
+/* 82 */
+EXTERN void		XDrawLine _ANSI_ARGS_((Display* d, Drawable dr, GC g, 
+				int x1, int y1, int x2, int y2));
 #endif /* MAC_TCL */
 
 typedef struct TkIntXlibStubs {
@@ -716,6 +722,7 @@ typedef struct TkIntXlibStubs {
     XVisualInfo * (*xGetVisualInfo) _ANSI_ARGS_((Display* display, long vinfo_mask, XVisualInfo* vinfo_template, int* nitems_return)); /* 101 */
     void (*xSetWMClientMachine) _ANSI_ARGS_((Display* display, Window w, XTextProperty* text_prop)); /* 102 */
     Status (*xStringListToTextProperty) _ANSI_ARGS_((char** list, int count, XTextProperty* text_prop_return)); /* 103 */
+    void (*xDrawLine) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int x1, int y1, int x2, int y2)); /* 104 */
 #endif /* __WIN32__ */
 #ifdef MAC_TCL
     void *reserved0;
@@ -800,6 +807,7 @@ typedef struct TkIntXlibStubs {
     Status (*xStringListToTextProperty) _ANSI_ARGS_((char** list, int count, XTextProperty* text_prop_return)); /* 79 */
     void (*xDrawSegments) _ANSI_ARGS_((Display * display, Drawable d, GC gc, XSegment * segments, int nsegments)); /* 80 */
     void (*xForceScreenSaver) _ANSI_ARGS_((Display* display, int mode)); /* 81 */
+    void (*xDrawLine) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int x1, int y1, int x2, int y2)); /* 82 */
 #endif /* MAC_TCL */
 } TkIntXlibStubs;
 
@@ -1228,6 +1236,10 @@ extern TkIntXlibStubs *tkIntXlibStubsPtr;
 #define XStringListToTextProperty \
 	(tkIntXlibStubsPtr->xStringListToTextProperty) /* 103 */
 #endif
+#ifndef XDrawLine
+#define XDrawLine \
+	(tkIntXlibStubsPtr->xDrawLine) /* 104 */
+#endif
 #endif /* __WIN32__ */
 #ifdef MAC_TCL
 /* Slot 0 is reserved */
@@ -1555,6 +1567,10 @@ extern TkIntXlibStubs *tkIntXlibStubsPtr;
 #define XForceScreenSaver \
 	(tkIntXlibStubsPtr->xForceScreenSaver) /* 81 */
 #endif
+#ifndef XDrawLine
+#define XDrawLine \
+	(tkIntXlibStubsPtr->xDrawLine) /* 82 */
+#endif
 #endif /* MAC_TCL */
 
 #endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index 2ebe002..18dab1e 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -8,7 +8,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkStubInit.c,v 1.8 1999/05/25 01:31:06 stanton Exp $
+ * RCS: @(#) $Id: tkStubInit.c,v 1.9 1999/06/16 20:11:29 surles Exp $
  */
 
 #include "tkInt.h"
@@ -565,6 +565,7 @@ TkIntXlibStubs tkIntXlibStubs = {
     XGetVisualInfo, /* 101 */
     XSetWMClientMachine, /* 102 */
     XStringListToTextProperty, /* 103 */
+    XDrawLine, /* 104 */
 #endif /* __WIN32__ */
 #ifdef MAC_TCL
     NULL, /* 0 */
@@ -649,6 +650,7 @@ TkIntXlibStubs tkIntXlibStubs = {
     XStringListToTextProperty, /* 79 */
     XDrawSegments, /* 80 */
     XForceScreenSaver, /* 81 */
+    XDrawLine, /* 82 */
 #endif /* MAC_TCL */
 };
 
diff --git a/generic/tkTest.c b/generic/tkTest.c
index 4b2fa93..c396345 100644
--- a/generic/tkTest.c
+++ b/generic/tkTest.c
@@ -13,7 +13,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkTest.c,v 1.5 1999/04/16 01:51:23 stanton Exp $
+ * RCS: @(#) $Id: tkTest.c,v 1.6 1999/06/16 20:11:29 surles Exp $
  */
 
 #include "tkInt.h"
@@ -206,7 +206,7 @@ extern int		TkplatformtestInit _ANSI_ARGS_((
 			    Tcl_Interp *interp));
 extern int              TclThread_Init _ANSI_ARGS_((Tcl_Interp *interp));
 
-#if !(defined(__WIN32__) || defined(MAC_TCL))
+#if !(defined(__WIN32__) && defined(MAC_TCL))
 #define TkplatformtestInit(x) TCL_OK
 #endif
 
diff --git a/generic/tkText.h b/generic/tkText.h
index 68cfff5..ce69521 100644
--- a/generic/tkText.h
+++ b/generic/tkText.h
@@ -10,15 +10,13 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkText.h,v 1.3 1999/04/16 01:51:23 stanton Exp $
+ * RCS: @(#) $Id: tkText.h,v 1.4 1999/06/16 20:11:29 surles Exp $
  */
 
 #ifndef _TKTEXT
 #define _TKTEXT
 
-#ifndef _TK
-#include "tk.h"
-#endif
+#include "tkInt.h"
 
 /*
  * Opaque types for structures whose guts are only needed by a single
@@ -780,23 +778,14 @@ extern TkTextTag *	TkTextCreateTag _ANSI_ARGS_((TkText *textPtr,
 extern void		TkTextFreeDInfo _ANSI_ARGS_((TkText *textPtr));
 extern void		TkTextFreeTag _ANSI_ARGS_((TkText *textPtr,
 			    TkTextTag *tagPtr));
-extern int		TkTextGetIndex _ANSI_ARGS_((Tcl_Interp *interp,
-			    TkText *textPtr, char *string,
-			    TkTextIndex *indexPtr));
 extern TkTextTabArray *	TkTextGetTabs _ANSI_ARGS_((Tcl_Interp *interp,
 			    Tk_Window tkwin, char *string));
-extern void		TkTextIndexBackBytes _ANSI_ARGS_((
-			    CONST TkTextIndex *srcPtr, int count,
-			    TkTextIndex *dstPtr));
 extern void		TkTextIndexBackChars _ANSI_ARGS_((
 			    CONST TkTextIndex *srcPtr, int count,
 			    TkTextIndex *dstPtr));
 extern int		TkTextIndexCmp _ANSI_ARGS_((
 			    CONST TkTextIndex *index1Ptr,
 			    CONST TkTextIndex *index2Ptr));
-extern void		TkTextIndexForwBytes _ANSI_ARGS_((
-			    CONST TkTextIndex *srcPtr, int count,
-			    TkTextIndex *dstPtr));
 extern void		TkTextIndexForwChars _ANSI_ARGS_((
 			    CONST TkTextIndex *srcPtr, int count,
 			    TkTextIndex *dstPtr));
@@ -808,12 +797,6 @@ extern void		TkTextInsertDisplayProc _ANSI_ARGS_((
 			    int screenY));
 extern void		TkTextLostSelection _ANSI_ARGS_((
 			    ClientData clientData));
-extern TkTextIndex *	TkTextMakeCharIndex _ANSI_ARGS_((TkTextBTree tree,
-			    int lineIndex, int charIndex,
-			    TkTextIndex *indexPtr));
-extern TkTextIndex *	TkTextMakeByteIndex _ANSI_ARGS_((TkTextBTree tree,
-			    int lineIndex, int byteIndex,
-			    TkTextIndex *indexPtr));
 extern int		TkTextMarkCmd _ANSI_ARGS_((TkText *textPtr,
 			    Tcl_Interp *interp, int argc, char **argv));
 extern int		TkTextMarkNameToIndex _ANSI_ARGS_((TkText *textPtr,
@@ -825,8 +808,6 @@ extern void		TkTextPickCurrent _ANSI_ARGS_((TkText *textPtr,
 			    XEvent *eventPtr));
 extern void		TkTextPixelIndex _ANSI_ARGS_((TkText *textPtr,
 			    int x, int y, TkTextIndex *indexPtr));
-extern void		TkTextPrintIndex _ANSI_ARGS_((
-			    CONST TkTextIndex *indexPtr, char *string));
 extern void		TkTextRedrawRegion _ANSI_ARGS_((TkText *textPtr,
 			    int x, int y, int width, int height));
 extern void		TkTextRedrawTag _ANSI_ARGS_((TkText *textPtr,
@@ -840,8 +821,6 @@ extern int		TkTextSeeCmd _ANSI_ARGS_((TkText *textPtr,
 extern int		TkTextSegToOffset _ANSI_ARGS_((
 			    CONST TkTextSegment *segPtr,
 			    CONST TkTextLine *linePtr));
-extern TkTextSegment *	TkTextSetMark _ANSI_ARGS_((TkText *textPtr, char *name,
-			    TkTextIndex *indexPtr));
 extern void		TkTextSetYView _ANSI_ARGS_((TkText *textPtr,
 			    TkTextIndex *indexPtr, int pickPlace));
 extern int		TkTextTagCmd _ANSI_ARGS_((TkText *textPtr,