Formatting

typo fixes
remove not existing tkDisplayList;
Useless re-definitions of TCL_STORAGE_CLASS

16 files changed, 29 insertions, 141 deletions

diff --git a/generic/tk3d.h b/generic/tk3d.h
index b03af94..cce78bf 100644
--- a/generic/tk3d.h
+++ b/generic/tk3d.h
@@ -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: tk3d.h,v 1.9 2010/04/20 15:14:29 nijtmans Exp $
+ * RCS: @(#) $Id: tk3d.h,v 1.10 2010/04/23 08:32:56 nijtmans Exp $
  */
 
 #ifndef _TK3D
@@ -16,11 +16,6 @@
 
 #include "tkInt.h"
 
-#ifdef BUILD_tk
-# undef TCL_STORAGE_CLASS
-# define TCL_STORAGE_CLASS DLLEXPORT
-#endif
-
 /*
  * One of the following data structures is allocated for each 3-D border
  * currently in use. Structures of this type are indexed by borderTable, so
@@ -89,7 +84,4 @@ MODULE_SCOPE TkBorder	*TkpGetBorder(void);
 MODULE_SCOPE void	TkpGetShadows(TkBorder *borderPtr, Tk_Window tkwin);
 MODULE_SCOPE void	TkpFreeBorder(TkBorder *borderPtr);
 
-# undef TCL_STORAGE_CLASS
-# define TCL_STORAGE_CLASS DLLIMPORT
-
 #endif /* _TK3D */
diff --git a/generic/tkButton.h b/generic/tkButton.h
index 2211255..b11d591 100644
--- a/generic/tkButton.h
+++ b/generic/tkButton.h
@@ -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: tkButton.h,v 1.18 2010/02/18 22:31:31 nijtmans Exp $
+ * RCS: @(#) $Id: tkButton.h,v 1.19 2010/04/23 08:32:56 nijtmans Exp $
  */
 
 #ifndef _TKBUTTON
@@ -19,11 +19,6 @@
 #include "tkInt.h"
 #endif
 
-#ifdef BUILD_tk
-# undef TCL_STORAGE_CLASS
-# define TCL_STORAGE_CLASS DLLEXPORT
-#endif
-
 /*
  * Legal values for the "compound" field of TkButton records.
  */
@@ -326,7 +321,4 @@ MODULE_SCOPE void	TkpDisplayButton(ClientData clientData);
 #endif
 MODULE_SCOPE int	TkInvokeButton(TkButton *butPtr);
 
-# undef TCL_STORAGE_CLASS
-# define TCL_STORAGE_CLASS DLLIMPORT
-
 #endif /* _TKBUTTON */
diff --git a/generic/tkColor.h b/generic/tkColor.h
index 36b5ec1..48fea2d 100644
--- a/generic/tkColor.h
+++ b/generic/tkColor.h
@@ -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: tkColor.h,v 1.12 2010/04/20 15:14:29 nijtmans Exp $
+ * RCS: @(#) $Id: tkColor.h,v 1.13 2010/04/23 08:32:56 nijtmans Exp $
  */
 
 #ifndef _TKCOLOR
@@ -16,11 +16,6 @@
 
 #include "tkInt.h"
 
-#ifdef BUILD_tk
-#undef TCL_STORAGE_CLASS
-#define TCL_STORAGE_CLASS DLLEXPORT
-#endif
-
 /*
  * One of the following data structures is used to keep track of each color
  * that is being used by the application; typically there is a colormap entry
@@ -79,7 +74,4 @@ MODULE_SCOPE void	TkpFreeColor(TkColor *tkColPtr);
 MODULE_SCOPE TkColor *	TkpGetColor(Tk_Window tkwin, Tk_Uid name);
 MODULE_SCOPE TkColor *	TkpGetColorByValue(Tk_Window tkwin, XColor *colorPtr);
 
-#undef TCL_STORAGE_CLASS
-#define TCL_STORAGE_CLASS DLLIMPORT
-
 #endif /* _TKCOLOR */
diff --git a/generic/tkEntry.h b/generic/tkEntry.h
index 9ade3a6..52535c8 100644
--- a/generic/tkEntry.h
+++ b/generic/tkEntry.h
@@ -16,11 +16,6 @@
 #include "tkInt.h"
 #endif
 
-#ifdef BUILD_tk
-#undef TCL_STORAGE_CLASS
-#define TCL_STORAGE_CLASS DLLEXPORT
-#endif
-
 enum EntryType {
     TK_ENTRY, TK_SPINBOX
 };
@@ -300,7 +295,4 @@ MODULE_SCOPE int	TkpDrawEntryBorderAndFocus(Entry *entryPtr,
 			    Drawable d, int isSpinbox);
 MODULE_SCOPE int	TkpDrawSpinboxButtons(Spinbox *sbPtr, Drawable d);
 
-#undef TCL_STORAGE_CLASS
-#define TCL_STORAGE_CLASS DLLIMPORT
-
 #endif /* _TKENTRY */
diff --git a/generic/tkFileFilter.h b/generic/tkFileFilter.h
index c6680df..5ddcc3d 100644
--- a/generic/tkFileFilter.h
+++ b/generic/tkFileFilter.h
@@ -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: tkFileFilter.h,v 1.8 2005/11/27 02:36:13 das Exp $
+ * RCS: @(#) $Id: tkFileFilter.h,v 1.9 2010/04/23 08:32:56 nijtmans Exp $
  *
  */
 
@@ -18,11 +18,6 @@
 
 #define OSType long
 
-#ifdef BUILD_tk
-# undef TCL_STORAGE_CLASS
-# define TCL_STORAGE_CLASS DLLEXPORT
-#endif
-
 typedef struct GlobPattern {
     struct GlobPattern *next;	/* Chains to the next glob pattern in a glob
 				 * pattern list */
@@ -83,6 +78,4 @@ MODULE_SCOPE int	TkGetFileFilters(Tcl_Interp *interp,
     			    FileFilterList *flistPtr, Tcl_Obj *valuePtr,
 			    int isWindows);
 
-# undef TCL_STORAGE_CLASS
-# define TCL_STORAGE_CLASS DLLIMPORT
-#endif
+#endif	/* _TK_FILE_FILTER */
diff --git a/generic/tkFont.h b/generic/tkFont.h
index be862f3..e59ecc1 100644
--- a/generic/tkFont.h
+++ b/generic/tkFont.h
@@ -10,17 +10,12 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkFont.h,v 1.15 2010/01/05 19:06:09 dkf Exp $
+ * RCS: @(#) $Id: tkFont.h,v 1.16 2010/04/23 08:32:56 nijtmans Exp $
  */
 
 #ifndef _TKFONT
 #define _TKFONT
 
-#ifdef BUILD_tk
-#undef TCL_STORAGE_CLASS
-#define TCL_STORAGE_CLASS DLLEXPORT
-#endif
-
 /*
  * The following structure keeps track of the attributes of a font. It can be
  * used to keep track of either the desired attributes or the actual
@@ -228,7 +223,4 @@ MODULE_SCOPE void	TkpGetFontFamilies(Tcl_Interp *interp,
 			    Tk_Window tkwin);
 MODULE_SCOPE TkFont *	TkpGetNativeFont(Tk_Window tkwin, const char *name);
 
-#undef TCL_STORAGE_CLASS
-#define TCL_STORAGE_CLASS DLLIMPORT
-
 #endif	/* _TKFONT */
diff --git a/generic/tkImgGIF.c b/generic/tkImgGIF.c
index e2c943b..b7bb956 100644
--- a/generic/tkImgGIF.c
+++ b/generic/tkImgGIF.c
@@ -29,10 +29,7 @@
  * |   provided "as is" without express or implied warranty.		|
  * +--------------------------------------------------------------------+
  *
- * This file also contains code from miGIF. See lower down in file for the
- * applicable copyright notice for that portion.
- *
- * RCS: @(#) $Id: tkImgGIF.c,v 1.46 2010/01/18 20:43:38 nijtmans Exp $
+ * RCS: @(#) $Id: tkImgGIF.c,v 1.47 2010/04/23 08:32:56 nijtmans Exp $
  */
 
 #include "tkInt.h"
@@ -1417,8 +1414,8 @@ Fread(
  *			lolo@pcsig22.etsimo.uniovi.es
  * Date:		Fri September 20 1996
  *
- * Modified for transparency handling (gif89a) and miGIF compression
- * by Jan Nijtmans <j.nijtmans@chello.nl>
+ * Modified for transparency handling (gif89a)
+ * by Jan Nijtmans <nijtmans@users.sourceforge.net>
  *
  *----------------------------------------------------------------------
  * FileWriteGIF-
@@ -1427,8 +1424,8 @@ Fread(
  *	data from a photo image into a given file
  *
  * Results:
- *	A standard TCL completion code. If TCL_ERROR is returned then an error
- *	message is left in interp->result.
+ *	A standard TCL completion code.  If TCL_ERROR is returned
+ *	then an error message is left in the interp's result.
  *
  *----------------------------------------------------------------------
  */
@@ -1534,7 +1531,7 @@ CommonWriteGIF(
 
     Tcl_Write(handle, (char *) (state.alphaOffset ? GIF89a : GIF87a), 6);
 
-    for (x=0 ; x<MAXCOLORMAPSIZE ; x++) {
+    for (x = 0; x < MAXCOLORMAPSIZE ;x++) {
 	state.mapa[x][CM_RED] = 255;
 	state.mapa[x][CM_GREEN] = 255;
 	state.mapa[x][CM_BLUE] = 255;
@@ -1583,7 +1580,7 @@ CommonWriteGIF(
 
     Tcl_Write(handle, (char *) &c, 1);
 
-    for (x=0 ; x<state.num ; x++) {
+    for (x = 0; x < state.num; x++) {
 	c = state.mapa[x][CM_RED];
 	Tcl_Write(handle, (char *) &c, 1);
 	c = state.mapa[x][CM_GREEN];
@@ -1647,7 +1644,7 @@ color(
 {
     int x = (statePtr->alphaOffset != 0);
 
-    for (; x<=MAXCOLORMAPSIZE ; x++) {
+    for (; x <= MAXCOLORMAPSIZE; x++) {
 	if ((statePtr->mapa[x][CM_RED] == red) &&
 		(statePtr->mapa[x][CM_GREEN] == green) &&
 		(statePtr->mapa[x][CM_BLUE] == blue)) {
@@ -1723,7 +1720,7 @@ ReadValue(
     if (statePtr->csize == 0) {
 	return EOF;
     }
-    if (statePtr->alphaOffset && statePtr->pixelo[statePtr->alphaOffset]==0) {
+    if (statePtr->alphaOffset && (statePtr->pixelo[statePtr->alphaOffset]==0)) {
 	col = 0;
     } else {
 	col = color(statePtr, statePtr->pixelo[0],
diff --git a/generic/tkInt.h b/generic/tkInt.h
index 3af90c0..0f8b4f1 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.121 2010/04/20 15:14:29 nijtmans Exp $
+ * RCS: $Id: tkInt.h,v 1.122 2010/04/23 08:32:56 nijtmans Exp $
  */
 
 #ifndef _TKINT
@@ -22,7 +22,7 @@
 #endif
 
 /*
- * Ensure WORDS_BIGENDIAN is defined correcly:
+ * Ensure WORDS_BIGENDIAN is defined correctly:
  * Needs to happen here in addition to configure to work with fat compiles on
  * Darwin (where configure runs only once for multiple architectures).
  */
@@ -883,12 +883,6 @@ typedef struct TkpClipMask {
 #define TKP_CLIP_REGION 1
 
 /*
- * Pointer to first entry in list of all displays currently known.
- */
-
-MODULE_SCOPE TkDisplay *tkDisplayList;
-
-/*
  * Return values from TkGrabState:
  */
 
@@ -1002,11 +996,6 @@ void Tcl_Panic(const char *, ...) __attribute__((analyzer_noreturn));
 
 #include "tkIntDecls.h"
 
-#ifdef BUILD_tk
-#undef TCL_STORAGE_CLASS
-#define TCL_STORAGE_CLASS DLLEXPORT
-#endif
-
 /*
  * Themed widget set init function:
  */
@@ -1262,9 +1251,6 @@ MODULE_SCOPE int	TkOldTestInit(Tcl_Interp *interp);
 MODULE_SCOPE int	TkplatformtestInit(Tcl_Interp *interp);
 #endif
 
-#undef TCL_STORAGE_CLASS
-#define TCL_STORAGE_CLASS DLLIMPORT
-
 #endif /* _TKINT */
 
 /*
diff --git a/generic/tkListbox.c b/generic/tkListbox.c
index e651f97..57f4c74 100644
--- a/generic/tkListbox.c
+++ b/generic/tkListbox.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: tkListbox.c,v 1.58 2010/01/13 23:08:06 nijtmans Exp $
+ * RCS: @(#) $Id: tkListbox.c,v 1.59 2010/04/23 08:32:56 nijtmans Exp $
  */
 
 #include "default.h"
@@ -26,7 +26,7 @@ typedef struct {
 				/* Table defining configuration options
 				 * available for the listbox. */
     Tk_OptionTable itemAttrOptionTable;
-				/* Table definining configuration options
+				/* Table defining configuration options
 				 * available for listbox items. */
 } ListboxOptionTables;
 
diff --git a/generic/tkMenu.h b/generic/tkMenu.h
index bc62322..e795579 100644
--- a/generic/tkMenu.h
+++ b/generic/tkMenu.h
@@ -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: tkMenu.h,v 1.17 2010/01/03 19:50:59 patthoyts Exp $
+ * RCS: @(#) $Id: tkMenu.h,v 1.18 2010/04/23 08:32:56 nijtmans Exp $
  */
 
 #ifndef _TKMENU
@@ -27,11 +27,6 @@
 #include "default.h"
 #endif
 
-#ifdef BUILD_tk
-# undef TCL_STORAGE_CLASS
-# define TCL_STORAGE_CLASS DLLEXPORT
-#endif
-
 /*
  * Dummy types used by the platform menu code.
  */
@@ -567,7 +562,4 @@ MODULE_SCOPE int	TkpPostMenu(Tcl_Interp *interp, TkMenu *menuPtr,
 			    int x, int y);
 MODULE_SCOPE void	TkpSetWindowMenuBar(Tk_Window tkwin, TkMenu *menuPtr);
 
-# undef TCL_STORAGE_CLASS
-# define TCL_STORAGE_CLASS DLLIMPORT
-
 #endif /* _TKMENU */
diff --git a/generic/tkMenubutton.h b/generic/tkMenubutton.h
index ded69a1..5a30190 100644
--- a/generic/tkMenubutton.h
+++ b/generic/tkMenubutton.h
@@ -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: tkMenubutton.h,v 1.15 2010/01/13 23:08:07 nijtmans Exp $
+ * RCS: @(#) $Id: tkMenubutton.h,v 1.16 2010/04/23 08:32:56 nijtmans Exp $
  */
 
 #ifndef _TKMENUBUTTON
@@ -23,11 +23,6 @@
 #include "tkMenu.h"
 #endif
 
-#ifdef BUILD_tk
-# undef TCL_STORAGE_CLASS
-# define TCL_STORAGE_CLASS DLLEXPORT
-#endif
-
 /*
  * Legal values for the "orient" field of TkMenubutton records.
  */
@@ -220,7 +215,4 @@ MODULE_SCOPE void	TkpDisplayMenuButton(ClientData clientData);
 MODULE_SCOPE void 	TkpDestroyMenuButton(TkMenuButton *mbPtr);
 MODULE_SCOPE void	TkMenuButtonWorldChanged(ClientData instanceData);
 
-# undef TCL_STORAGE_CLASS
-# define TCL_STORAGE_CLASS DLLIMPORT
-
 #endif /* _TKMENUBUTTON */
diff --git a/generic/tkScale.h b/generic/tkScale.h
index d73d378..3164af7 100644
--- a/generic/tkScale.h
+++ b/generic/tkScale.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: tkScale.h,v 1.10 2005/11/27 02:36:14 das Exp $
+ * RCS: @(#) $Id: tkScale.h,v 1.11 2010/04/23 08:32:56 nijtmans Exp $
  */
 
 #ifndef _TKSCALE
@@ -20,11 +20,6 @@
 #include "tkInt.h"
 #endif
 
-#ifdef BUILD_tk
-# undef TCL_STORAGE_CLASS
-# define TCL_STORAGE_CLASS DLLEXPORT
-#endif
-
 /*
  * Legal values for the "orient" field of TkScale records.
  */
@@ -242,7 +237,4 @@ MODULE_SCOPE void	TkScaleSetValue(TkScale *scalePtr, double value,
 MODULE_SCOPE double	TkScalePixelToValue(TkScale *scalePtr, int x, int y);
 MODULE_SCOPE int	TkScaleValueToPixel(TkScale *scalePtr, double value);
 
-# undef TCL_STORAGE_CLASS
-# define TCL_STORAGE_CLASS DLLIMPORT
-
 #endif /* _TKSCALE */
diff --git a/generic/tkScrollbar.h b/generic/tkScrollbar.h
index e9e52b4..1cb5164 100644
--- a/generic/tkScrollbar.h
+++ b/generic/tkScrollbar.h
@@ -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: tkScrollbar.h,v 1.10 2010/02/17 19:21:16 nijtmans Exp $
+ * RCS: @(#) $Id: tkScrollbar.h,v 1.11 2010/04/23 08:32:56 nijtmans Exp $
  */
 
 #ifndef _TKSCROLLBAR
@@ -19,11 +19,6 @@
 #include "tkInt.h"
 #endif
 
-#ifdef BUILD_tk
-# undef TCL_STORAGE_CLASS
-# define TCL_STORAGE_CLASS DLLEXPORT
-#endif
-
 /*
  * A data structure of the following type is kept for each scrollbar widget.
  */
@@ -187,7 +182,4 @@ MODULE_SCOPE void	TkpConfigureScrollbar(TkScrollbar *scrollPtr);
 MODULE_SCOPE int	TkpScrollbarPosition(TkScrollbar *scrollPtr,
 			    int x, int y);
 
-# undef TCL_STORAGE_CLASS
-# define TCL_STORAGE_CLASS DLLIMPORT
-
 #endif /* _TKSCROLLBAR */
diff --git a/generic/tkText.h b/generic/tkText.h
index a819752..da9611f 100644
--- a/generic/tkText.h
+++ b/generic/tkText.h
@@ -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: tkText.h,v 1.38 2010/03/11 09:43:19 dkf Exp $
+ * RCS: @(#) $Id: tkText.h,v 1.39 2010/04/23 08:32:56 nijtmans Exp $
  */
 
 #ifndef _TKTEXT
@@ -23,11 +23,6 @@
 #include "tkUndo.h"
 #endif
 
-#ifdef BUILD_tk
-# undef TCL_STORAGE_CLASS
-# define TCL_STORAGE_CLASS DLLEXPORT
-#endif
-
 /*
  * The data structure below defines a single logical line of text (from
  * newline to newline, not necessarily what appears on one display line of the
@@ -489,7 +484,7 @@ typedef struct TkTextTabArray {
 } TkTextTabArray;
 
 /*
- * Enumeration definining the edit modes of the widget.
+ * Enumeration defining the edit modes of the widget.
  */
 
 typedef enum {
@@ -1147,9 +1142,6 @@ MODULE_SCOPE int	TkTextYviewCmd(TkText *textPtr, Tcl_Interp *interp,
 MODULE_SCOPE void	TkTextWinFreeClient(Tcl_HashEntry *hPtr,
 			    TkTextEmbWindowClient *client);
 
-# undef TCL_STORAGE_CLASS
-# define TCL_STORAGE_CLASS DLLIMPORT
-
 #endif /* _TKTEXT */
 
 /*
diff --git a/generic/tkTrig.c b/generic/tkTrig.c
index 58e642b..97a9d06 100644
--- a/generic/tkTrig.c
+++ b/generic/tkTrig.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: tkTrig.c,v 1.12 2010/01/18 20:43:38 nijtmans Exp $
+ * RCS: @(#) $Id: tkTrig.c,v 1.13 2010/04/23 08:32:56 nijtmans Exp $
  */
 
 #include "tkInt.h"
@@ -753,7 +753,7 @@ TkOvalToPoint(
 
 int
 TkOvalToArea(
-    register double *ovalPtr,	/* Points to coordinates definining the
+    register double *ovalPtr,	/* Points to coordinates defining the
 				 * bounding rectangle for the oval: x1, y1,
 				 * x2, y2. X1 must be less than x2 and y1 less
 				 * than y2. */
diff --git a/generic/tkUndo.h b/generic/tkUndo.h
index 0776ea3..25a97e9 100644
--- a/generic/tkUndo.h
+++ b/generic/tkUndo.h
@@ -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: tkUndo.h,v 1.8 2007/12/13 15:24:21 dgp Exp $
+ * RCS: @(#) $Id: tkUndo.h,v 1.9 2010/04/23 08:32:56 nijtmans Exp $
  */
 
 #ifndef _TKUNDO
@@ -18,13 +18,8 @@
 #include "tkInt.h"
 #endif
 
-#ifdef BUILD_tk
-# undef TCL_STORAGE_CLASS
-# define TCL_STORAGE_CLASS DLLEXPORT
-#endif
-
 /*
- * Enum definining the types used in an undo stack.
+ * Enum defining the types used in an undo stack.
  */
 
 typedef enum {
@@ -117,7 +112,4 @@ MODULE_SCOPE void	TkUndoPushAction(TkUndoRedoStack *stack,
 MODULE_SCOPE int	TkUndoRevert(TkUndoRedoStack *stack);
 MODULE_SCOPE int	TkUndoApply(TkUndoRedoStack *stack);
 
-# undef TCL_STORAGE_CLASS
-# define TCL_STORAGE_CLASS DLLIMPORT
-
 #endif /* _TKUNDO */