diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | generic/tkPanedWindow.c | 6 | ||||
| -rw-r--r-- | generic/tkText.c | 6 | ||||
| -rw-r--r-- | generic/tkText.h | 4 | ||||
| -rw-r--r-- | generic/tkTextTag.c | 4 |
5 files changed, 17 insertions, 10 deletions
@@ -1,3 +1,10 @@ +2006-10-17 Don Porter <dgp@users.sourceforge.net> + + * generic/tkPanedWindow.c: Cleaned up some code flagged by a + * generic/tkText.c: `make checkexports` test. + * generic/tkText.h + * generic/tkTextTag.c: + 2006-10-16 Daniel Steffen <das@users.sourceforge.net> *** 8.4.14 TAGGED FOR RELEASE *** diff --git a/generic/tkPanedWindow.c b/generic/tkPanedWindow.c index e286851..d97872f 100644 --- a/generic/tkPanedWindow.c +++ b/generic/tkPanedWindow.c @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkPanedWindow.c,v 1.13.2.9 2005/08/11 12:17:09 dkf Exp $ + * RCS: @(#) $Id: tkPanedWindow.c,v 1.13.2.10 2006/10/17 05:38:47 dgp Exp $ */ #include "tkPort.h" @@ -164,7 +164,7 @@ static void PanedWindowEventProc _ANSI_ARGS_((ClientData clientData, static void ProxyWindowEventProc _ANSI_ARGS_((ClientData clientData, XEvent *eventPtr)); static void DisplayProxyWindow _ANSI_ARGS_((ClientData clientData)); -void PanedWindowWorldChanged _ANSI_ARGS_((ClientData instanceData)); +static void PanedWindowWorldChanged _ANSI_ARGS_((ClientData instanceData)); static int PanedWindowWidgetObjCmd _ANSI_ARGS_((ClientData clientData, Tcl_Interp *, int objc, Tcl_Obj * CONST objv[])); static void PanedWindowLostSlaveProc _ANSI_ARGS_((ClientData clientData, @@ -1225,7 +1225,7 @@ ConfigurePanedWindow(interp, pwPtr, objc, objv) *---------------------------------------------------------------------- */ -void +static void PanedWindowWorldChanged(instanceData) ClientData instanceData; /* Information about the paned window. */ { diff --git a/generic/tkText.c b/generic/tkText.c index 750d0d8..0c0f44f 100644 --- a/generic/tkText.c +++ b/generic/tkText.c @@ -14,7 +14,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkText.c,v 1.33.2.4 2006/09/10 17:07:35 das Exp $ + * RCS: @(#) $Id: tkText.c,v 1.33.2.5 2006/10/17 05:38:48 dgp Exp $ */ #include "default.h" @@ -140,7 +140,7 @@ static Tk_ConfigSpec configSpecs[] = { {TK_CONFIG_INT, "-width", "width", "Width", DEF_TEXT_WIDTH, Tk_Offset(TkText, width), 0}, {TK_CONFIG_CUSTOM, "-wrap", "wrap", "Wrap", - DEF_TEXT_WRAP, Tk_Offset(TkText, wrapMode), 0, &textWrapModeOption}, + DEF_TEXT_WRAP, Tk_Offset(TkText, wrapMode), 0, &TkTextWrapModeOption}, {TK_CONFIG_STRING, "-xscrollcommand", "xScrollCommand", "ScrollCommand", DEF_TEXT_XSCROLL_COMMAND, Tk_Offset(TkText, xScrollCmd), TK_CONFIG_NULL_OK}, @@ -169,7 +169,7 @@ static char * WrapModePrintProc _ANSI_ARGS_((ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr)); -Tk_CustomOption textWrapModeOption = { +Tk_CustomOption TkTextWrapModeOption = { WrapModeParseProc, WrapModePrintProc, (ClientData) NULL diff --git a/generic/tkText.h b/generic/tkText.h index a8ed021..7e1f666 100644 --- a/generic/tkText.h +++ b/generic/tkText.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: tkText.h,v 1.13 2002/12/27 23:43:38 davygrvy Exp $ + * RCS: @(#) $Id: tkText.h,v 1.13.2.1 2006/10/17 05:38:48 dgp Exp $ */ #ifndef _TKTEXT @@ -282,7 +282,7 @@ typedef enum { TEXT_WRAPMODE_NULL, TEXT_WRAPMODE_NONE, TEXT_WRAPMODE_CHAR, TEXT_WRAPMODE_WORD } TkWrapMode; -EXTERN Tk_CustomOption textWrapModeOption; +EXTERN Tk_CustomOption TkTextWrapModeOption; typedef struct TkTextTag { char *name; /* Name of this tag. This field is actually diff --git a/generic/tkTextTag.c b/generic/tkTextTag.c index 81fc5cb..cd52cc9 100644 --- a/generic/tkTextTag.c +++ b/generic/tkTextTag.c @@ -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: tkTextTag.c,v 1.8 2002/08/05 04:30:40 dgp Exp $ + * RCS: @(#) $Id: tkTextTag.c,v 1.8.2.1 2006/10/17 05:38:48 dgp Exp $ */ #include "default.h" @@ -64,7 +64,7 @@ static Tk_ConfigSpec tagConfigSpecs[] = { TK_CONFIG_NULL_OK}, {TK_CONFIG_CUSTOM, "-wrap", (char *) NULL, (char *) NULL, (char *) NULL, Tk_Offset(TkTextTag, wrapMode), - TK_CONFIG_NULL_OK, &textWrapModeOption}, + TK_CONFIG_NULL_OK, &TkTextWrapModeOption}, {TK_CONFIG_END, (char *) NULL, (char *) NULL, (char *) NULL, (char *) NULL, 0, 0} }; |