diff options
49 files changed, 49 insertions, 96 deletions
diff --git a/generic/tkCanvas.c b/generic/tkCanvas.c index 64e0f5d..fa7559c 100644 --- a/generic/tkCanvas.c +++ b/generic/tkCanvas.c @@ -15,9 +15,9 @@ /* #define USE_OLD_TAG_SEARCH 1 */ -#include "default.h" #include "tkInt.h" #include "tkCanvas.h" +#include "default.h" #ifdef TK_NO_DOUBLE_BUFFERING #ifdef MAC_OSX_TK #include "tkMacOSXInt.h" diff --git a/generic/tkEntry.c b/generic/tkEntry.c index 018380d..cf15974 100644 --- a/generic/tkEntry.c +++ b/generic/tkEntry.c @@ -16,8 +16,8 @@ */ #include "tkInt.h" -#include "default.h" #include "tkEntry.h" +#include "default.h" /* * The following macro defines how many extra pixels to leave on each side of diff --git a/generic/tkFrame.c b/generic/tkFrame.c index e2aee37..1ed3268 100644 --- a/generic/tkFrame.c +++ b/generic/tkFrame.c @@ -12,8 +12,8 @@ * this file, and for a DISCLAIMER OF ALL WARRANTIES. */ -#include "default.h" #include "tkInt.h" +#include "default.h" /* * The following enum is used to define the type of the frame. diff --git a/generic/tkInt.h b/generic/tkInt.h index b784bfb..81da2bc 100644 --- a/generic/tkInt.h +++ b/generic/tkInt.h @@ -25,7 +25,6 @@ * Darwin (where configure runs only once for multiple architectures). */ -#include <stdio.h> #ifdef HAVE_SYS_TYPES_H # include <sys/types.h> #endif diff --git a/generic/tkListbox.c b/generic/tkListbox.c index 1e5b92e..6cbf224 100644 --- a/generic/tkListbox.c +++ b/generic/tkListbox.c @@ -12,8 +12,8 @@ * this file, and for a DISCLAIMER OF ALL WARRANTIES. */ -#include "default.h" #include "tkInt.h" +#include "default.h" #ifdef _WIN32 #include "tkWinInt.h" diff --git a/generic/tkMain.c b/generic/tkMain.c index 40d35fe..ffcaecf 100644 --- a/generic/tkMain.c +++ b/generic/tkMain.c @@ -30,14 +30,6 @@ #endif #include "tkInt.h" -#include <ctype.h> -#include <stdio.h> -#include <string.h> -#ifdef NO_STDLIB_H -# include "../compat/stdlib.h" -#else -# include <stdlib.h> -#endif extern int TkCygwinMainEx(int, char **, Tcl_AppInitProc *, Tcl_Interp *); diff --git a/generic/tkMessage.c b/generic/tkMessage.c index f65b046..74b62b1 100644 --- a/generic/tkMessage.c +++ b/generic/tkMessage.c @@ -13,8 +13,8 @@ * this file, and for a DISCLAIMER OF ALL WARRANTIES. */ -#include "default.h" #include "tkInt.h" +#include "default.h" /* * A data structure of the following type is kept for each message widget diff --git a/generic/tkPanedWindow.c b/generic/tkPanedWindow.c index 18fd179..dafadb0 100644 --- a/generic/tkPanedWindow.c +++ b/generic/tkPanedWindow.c @@ -13,8 +13,8 @@ * this file, and for a DISCLAIMER OF ALL WARRANTIES. */ -#include "default.h" #include "tkInt.h" +#include "default.h" /* * Flag values for "sticky"ness. The 16 combinations subsume the packer's diff --git a/generic/tkScale.c b/generic/tkScale.c index 1c65001..5733c8a 100644 --- a/generic/tkScale.c +++ b/generic/tkScale.c @@ -17,9 +17,9 @@ * this file, and for a DISCLAIMER OF ALL WARRANTIES. */ -#include "default.h" #include "tkInt.h" #include "tkScale.h" +#include "default.h" #if defined(_WIN32) #define snprintf _snprintf diff --git a/generic/tkText.c b/generic/tkText.c index bc60e90..1585e27 100644 --- a/generic/tkText.c +++ b/generic/tkText.c @@ -14,9 +14,9 @@ * this file, and for a DISCLAIMER OF ALL WARRANTIES. */ -#include "default.h" #include "tkInt.h" #include "tkUndo.h" +#include "default.h" #if defined(MAC_OSX_TK) #define Style TkStyle diff --git a/generic/tkTextIndex.c b/generic/tkTextIndex.c index 7430197..0ee7347 100644 --- a/generic/tkTextIndex.c +++ b/generic/tkTextIndex.c @@ -11,9 +11,9 @@ * this file, and for a DISCLAIMER OF ALL WARRANTIES. */ -#include "default.h" #include "tkInt.h" #include "tkText.h" +#include "default.h" /* * Index to use to select last character in line (very large integer): diff --git a/generic/tkTextTag.c b/generic/tkTextTag.c index 66f467b..d8ffb5a 100644 --- a/generic/tkTextTag.c +++ b/generic/tkTextTag.c @@ -12,9 +12,9 @@ * this file, and for a DISCLAIMER OF ALL WARRANTIES. */ -#include "default.h" #include "tkInt.h" #include "tkText.h" +#include "default.h" /* * The 'TkWrapMode' enum in tkText.h is used to define a type for the -wrap diff --git a/generic/ttk/ttkBlink.c b/generic/ttk/ttkBlink.c index 706a871..7294f8b 100644 --- a/generic/ttk/ttkBlink.c +++ b/generic/ttk/ttkBlink.c @@ -14,7 +14,7 @@ * Add script-level access to configure application-wide blink rate. */ -#include <tk.h> +#include "tkInt.h" #include "ttkTheme.h" #include "ttkWidget.h" diff --git a/generic/ttk/ttkButton.c b/generic/ttk/ttkButton.c index 935d0c4..722e034 100644 --- a/generic/ttk/ttkButton.c +++ b/generic/ttk/ttkButton.c @@ -4,8 +4,7 @@ * label, button, checkbutton, radiobutton, and menubutton widgets. */ -#include <string.h> -#include <tk.h> +#include "tkInt.h" #include "ttkTheme.h" #include "ttkWidget.h" diff --git a/generic/ttk/ttkCache.c b/generic/ttk/ttkCache.c index 0ae2372..c29007c 100644 --- a/generic/ttk/ttkCache.c +++ b/generic/ttk/ttkCache.c @@ -28,8 +28,7 @@ * but this will be a transient effect. */ -#include <stdio.h> /* for sprintf */ -#include <tk.h> +#include "tkInt.h" #include "ttkTheme.h" struct Ttk_ResourceCache_ { diff --git a/generic/ttk/ttkClamTheme.c b/generic/ttk/ttkClamTheme.c index b44eeb5..e9bc74a 100644 --- a/generic/ttk/ttkClamTheme.c +++ b/generic/ttk/ttkClamTheme.c @@ -4,7 +4,7 @@ * "clam" theme; inspired by the XFCE family of Gnome themes. */ -#include <tk.h> +#include "tkInt.h" #include "ttkTheme.h" /* diff --git a/generic/ttk/ttkClassicTheme.c b/generic/ttk/ttkClassicTheme.c index d16cb85..117d928 100644 --- a/generic/ttk/ttkClassicTheme.c +++ b/generic/ttk/ttkClassicTheme.c @@ -5,7 +5,7 @@ * */ -#include <tk.h> +#include "tkInt.h" #include <X11/Xlib.h> #include <X11/Xutil.h> #include "ttkTheme.h" diff --git a/generic/ttk/ttkDefaultTheme.c b/generic/ttk/ttkDefaultTheme.c index 7332015..2118704 100644 --- a/generic/ttk/ttkDefaultTheme.c +++ b/generic/ttk/ttkDefaultTheme.c @@ -4,10 +4,7 @@ * Tk alternate theme, intended to match the MSUE and Gtk's (old) default theme */ -#include <math.h> -#include <string.h> - -#include <tkInt.h> +#include "tkInt.h" #include <X11/Xlib.h> #include <X11/Xutil.h> #include "ttkTheme.h" diff --git a/generic/ttk/ttkElements.c b/generic/ttk/ttkElements.c index 5c95dba..4dd2adb 100644 --- a/generic/ttk/ttkElements.c +++ b/generic/ttk/ttkElements.c @@ -5,9 +5,7 @@ * */ -#include <tcl.h> -#include <tk.h> -#include <string.h> +#include "tkInt.h" #include "ttkTheme.h" #include "ttkWidget.h" diff --git a/generic/ttk/ttkEntry.c b/generic/ttk/ttkEntry.c index 5c8e98b..e49f1c3 100644 --- a/generic/ttk/ttkEntry.c +++ b/generic/ttk/ttkEntry.c @@ -8,9 +8,7 @@ * Copyright (c) 2004 Joe English */ -#include <string.h> -#include <stdio.h> -#include <tkInt.h> +#include "tkInt.h" #include <X11/Xatom.h> #include "ttkTheme.h" diff --git a/generic/ttk/ttkFrame.c b/generic/ttk/ttkFrame.c index 3e50a7f..10106eb 100644 --- a/generic/ttk/ttkFrame.c +++ b/generic/ttk/ttkFrame.c @@ -4,8 +4,7 @@ * ttk::frame and ttk::labelframe widgets. */ -#include <tk.h> - +#include "tkInt.h" #include "ttkTheme.h" #include "ttkWidget.h" #include "ttkManager.h" diff --git a/generic/ttk/ttkImage.c b/generic/ttk/ttkImage.c index a9393dc..002a753 100644 --- a/generic/ttk/ttkImage.c +++ b/generic/ttk/ttkImage.c @@ -10,8 +10,7 @@ * [style map]. */ -#include <string.h> -#include <tk.h> +#include "tkInt.h" #include "ttkTheme.h" #define MIN(a,b) ((a) < (b) ? (a) : (b)) diff --git a/generic/ttk/ttkInit.c b/generic/ttk/ttkInit.c index ae0882f..60e3b6f 100644 --- a/generic/ttk/ttkInit.c +++ b/generic/ttk/ttkInit.c @@ -4,8 +4,7 @@ * Ttk package: initialization routine and miscellaneous utilities. */ -#include <string.h> -#include <tk.h> +#include "tkInt.h" #include "ttkTheme.h" #include "ttkWidget.h" diff --git a/generic/ttk/ttkLabel.c b/generic/ttk/ttkLabel.c index b8b7f29..91be033 100644 --- a/generic/ttk/ttkLabel.c +++ b/generic/ttk/ttkLabel.c @@ -6,8 +6,7 @@ * */ -#include <tcl.h> -#include <tkInt.h> +#include "tkInt.h" #include "ttkTheme.h" /*---------------------------------------------------------------------- diff --git a/generic/ttk/ttkLayout.c b/generic/ttk/ttkLayout.c index 8a6c3ee..795ffb5 100644 --- a/generic/ttk/ttkLayout.c +++ b/generic/ttk/ttkLayout.c @@ -6,8 +6,7 @@ * Copyright (c) 2003 Joe English. Freely redistributable. */ -#include <string.h> -#include <tk.h> +#include "tkInt.h" #include "ttkThemeInt.h" #define MAX(a,b) (a > b ? a : b) diff --git a/generic/ttk/ttkManager.c b/generic/ttk/ttkManager.c index 031fdec..bf93699 100644 --- a/generic/ttk/ttkManager.c +++ b/generic/ttk/ttkManager.c @@ -4,8 +4,7 @@ * Support routines for geometry managers. */ -#include <string.h> -#include <tk.h> +#include "tkInt.h" #include "ttkManager.h" /*------------------------------------------------------------------------ diff --git a/generic/ttk/ttkNotebook.c b/generic/ttk/ttkNotebook.c index 2894887..d2ee50c 100644 --- a/generic/ttk/ttkNotebook.c +++ b/generic/ttk/ttkNotebook.c @@ -2,11 +2,7 @@ * Copyright (c) 2004, Joe English */ -#include <string.h> -#include <ctype.h> -#include <stdio.h> -#include <tk.h> - +#include "tkInt.h" #include "ttkTheme.h" #include "ttkWidget.h" #include "ttkManager.h" diff --git a/generic/ttk/ttkPanedwindow.c b/generic/ttk/ttkPanedwindow.c index 76d07a2..1c99a0b 100644 --- a/generic/ttk/ttkPanedwindow.c +++ b/generic/ttk/ttkPanedwindow.c @@ -6,8 +6,7 @@ * TODO: track active/pressed sash. */ -#include <string.h> -#include <tk.h> +#include "tkInt.h" #include "ttkManager.h" #include "ttkTheme.h" #include "ttkWidget.h" diff --git a/generic/ttk/ttkProgress.c b/generic/ttk/ttkProgress.c index cfd8e57..b805357 100644 --- a/generic/ttk/ttkProgress.c +++ b/generic/ttk/ttkProgress.c @@ -4,9 +4,7 @@ * ttk::progressbar widget. */ -#include <math.h> -#include <tk.h> - +#include "tkInt.h" #include "ttkTheme.h" #include "ttkWidget.h" diff --git a/generic/ttk/ttkScale.c b/generic/ttk/ttkScale.c index edeefaa..458bccd 100644 --- a/generic/ttk/ttkScale.c +++ b/generic/ttk/ttkScale.c @@ -4,9 +4,7 @@ * ttk::scale widget. */ -#include <tk.h> -#include <string.h> -#include <stdio.h> +#include "tkInt.h" #include "ttkTheme.h" #include "ttkWidget.h" diff --git a/generic/ttk/ttkScroll.c b/generic/ttk/ttkScroll.c index 2bd3ddb..184f5f2 100644 --- a/generic/ttk/ttkScroll.c +++ b/generic/ttk/ttkScroll.c @@ -34,7 +34,7 @@ * TtkScrollbarUpdateRequired, which will invoke step (5) (@@@ Fix this) */ -#include <tkInt.h> +#include "tkInt.h" #include "ttkTheme.h" #include "ttkWidget.h" diff --git a/generic/ttk/ttkScrollbar.c b/generic/ttk/ttkScrollbar.c index 9d99ea5..f304ea9 100644 --- a/generic/ttk/ttkScrollbar.c +++ b/generic/ttk/ttkScrollbar.c @@ -4,8 +4,7 @@ * ttk::scrollbar widget. */ -#include <tk.h> - +#include "tkInt.h" #include "ttkTheme.h" #include "ttkWidget.h" diff --git a/generic/ttk/ttkSeparator.c b/generic/ttk/ttkSeparator.c index b52e6f4..dae6d69 100644 --- a/generic/ttk/ttkSeparator.c +++ b/generic/ttk/ttkSeparator.c @@ -4,8 +4,7 @@ * ttk::separator and ttk::sizegrip widgets. */ -#include <tk.h> - +#include "tkInt.h" #include "ttkTheme.h" #include "ttkWidget.h" diff --git a/generic/ttk/ttkSquare.c b/generic/ttk/ttkSquare.c index 7837310..5302eb7 100644 --- a/generic/ttk/ttkSquare.c +++ b/generic/ttk/ttkSquare.c @@ -3,7 +3,7 @@ * Minimal sample ttk widget. */ -#include <tk.h> +#include "tkInt.h" #include "ttkTheme.h" #include "ttkWidget.h" diff --git a/generic/ttk/ttkState.c b/generic/ttk/ttkState.c index 2941ca8..7ac6740 100644 --- a/generic/ttk/ttkState.c +++ b/generic/ttk/ttkState.c @@ -5,9 +5,7 @@ * */ -#include <string.h> - -#include <tk.h> +#include "tkInt.h" #include "ttkTheme.h" /* diff --git a/generic/ttk/ttkTagSet.c b/generic/ttk/ttkTagSet.c index 31798ea..f0354d8 100644 --- a/generic/ttk/ttkTagSet.c +++ b/generic/ttk/ttkTagSet.c @@ -4,10 +4,7 @@ * Copyright (C) 2005, Joe English. Freely redistributable. */ -#include <string.h> /* for memset() */ -#include <tcl.h> -#include <tk.h> - +#include "tkInt.h" #include "ttkTheme.h" #include "ttkWidget.h" diff --git a/generic/ttk/ttkTheme.c b/generic/ttk/ttkTheme.c index 8c352ed..342b16a 100644 --- a/generic/ttk/ttkTheme.c +++ b/generic/ttk/ttkTheme.c @@ -10,10 +10,7 @@ * of this file, and for a DISCLAIMER OF ALL WARRANTIES. */ -#include <stdlib.h> -#include <string.h> -#include <tk.h> -#include <tkInt.h> +#include "tkInt.h" #include "ttkThemeInt.h" #define PKG_ASSOC_KEY "Ttk" diff --git a/generic/ttk/ttkTrace.c b/generic/ttk/ttkTrace.c index c8bbdaf..51006f8 100644 --- a/generic/ttk/ttkTrace.c +++ b/generic/ttk/ttkTrace.c @@ -7,7 +7,7 @@ * from other errors (which are not). */ -#include <tk.h> +#include "tkInt.h" #include "ttkTheme.h" #include "ttkWidget.h" diff --git a/generic/ttk/ttkTrack.c b/generic/ttk/ttkTrack.c index 396b073..fa2a7e0 100644 --- a/generic/ttk/ttkTrack.c +++ b/generic/ttk/ttkTrack.c @@ -23,7 +23,7 @@ * TODO: Handle "chords" properly (e.g., <B1-ButtonPress-2>) */ -#include <tk.h> +#include "tkInt.h" #include "ttkTheme.h" #include "ttkWidget.h" diff --git a/generic/ttk/ttkTreeview.c b/generic/ttk/ttkTreeview.c index c46f7e3..a09ff84 100644 --- a/generic/ttk/ttkTreeview.c +++ b/generic/ttk/ttkTreeview.c @@ -4,9 +4,7 @@ * ttk::treeview widget implementation. */ -#include <string.h> -#include <stdio.h> -#include <tk.h> +#include "tkInt.h" #include "ttkTheme.h" #include "ttkWidget.h" diff --git a/generic/ttk/ttkWidget.c b/generic/ttk/ttkWidget.c index a1f9c0a..c2f8d60 100644 --- a/generic/ttk/ttkWidget.c +++ b/generic/ttk/ttkWidget.c @@ -4,8 +4,7 @@ * Core widget utilities. */ -#include <string.h> -#include <tk.h> +#include "tkInt.h" #include "ttkTheme.h" #include "ttkWidget.h" diff --git a/unix/tkUnixMenu.c b/unix/tkUnixMenu.c index bc1bd2e..f4eab4f 100644 --- a/unix/tkUnixMenu.c +++ b/unix/tkUnixMenu.c @@ -9,9 +9,9 @@ * this file, and for a DISCLAIMER OF ALL WARRANTIES. */ -#include "default.h" #include "tkUnixInt.h" #include "tkMenu.h" +#include "default.h" /* * Constants used for menu drawing. diff --git a/win/stubs.c b/win/stubs.c index 1cf23ef..c3e853e 100644 --- a/win/stubs.c +++ b/win/stubs.c @@ -1,4 +1,4 @@ -#include "tk.h" +#include "tkInt.h" /* * Undocumented Xlib internal function diff --git a/win/tkWinDialog.c b/win/tkWinDialog.c index d6d2c7d..d8eec68 100644 --- a/win/tkWinDialog.c +++ b/win/tkWinDialog.c @@ -2227,9 +2227,9 @@ static void FreeFilterVista(DWORD count, TCLCOMDLG_FILTERSPEC *dlgFilterPtr) DWORD dw; for (dw = 0; dw < count; ++dw) { if (dlgFilterPtr[dw].pszName != NULL) - ckfree(dlgFilterPtr[dw].pszName); + ckfree((char *)dlgFilterPtr[dw].pszName); if (dlgFilterPtr[dw].pszSpec != NULL) - ckfree(dlgFilterPtr[dw].pszSpec); + ckfree((char *)dlgFilterPtr[dw].pszSpec); } ckfree(dlgFilterPtr); } diff --git a/win/tkWinPort.h b/win/tkWinPort.h index 965dbc5..11b60f3 100644 --- a/win/tkWinPort.h +++ b/win/tkWinPort.h @@ -21,6 +21,7 @@ *--------------------------------------------------------------------------- */ +#include <stdio.h> #include <wchar.h> #include <io.h> #include <stdlib.h> diff --git a/win/tkWinX.c b/win/tkWinX.c index f09da15..f666152 100644 --- a/win/tkWinX.c +++ b/win/tkWinX.c @@ -610,7 +610,7 @@ TkpCloseDisplay( ckfree(display->screens->root_visual); } if (display->screens->root != None) { - ckfree(display->screens->root); + ckfree((char *)display->screens->root); } if (display->screens->cmap != None) { XFreeColormap(display, display->screens->cmap); diff --git a/win/ttkWinXPTheme.c b/win/ttkWinXPTheme.c index 4a198a3..4f822a7 100644 --- a/win/ttkWinXPTheme.c +++ b/win/ttkWinXPTheme.c @@ -428,8 +428,8 @@ static void DestroyElementData(void *clientData) ElementData *elementData = clientData; if (elementData->info->flags & HEAP_ELEMENT) { ckfree(elementData->info->statemap); - ckfree(elementData->info->className); - ckfree(elementData->info->elementName); + ckfree((char *)elementData->info->className); + ckfree((char *)elementData->info->elementName); ckfree(elementData->info); } ckfree(clientData); @@ -84,7 +84,7 @@ static void FreeClipMask(GC gc) { TkpReleaseRegion(((TkpClipMask*) gc->clip_mask)->value.region); } #endif - ckfree(gc->clip_mask); + ckfree((char *) gc->clip_mask); gc->clip_mask = None; } } diff --git a/xlib/xutil.c b/xlib/xutil.c index 7b69e18..c629b82 100644 --- a/xlib/xutil.c +++ b/xlib/xutil.c @@ -9,9 +9,7 @@ * this file, and for a DISCLAIMER OF ALL WARRANTIES. */ -#include <stdlib.h> -#include <tk.h> - +#include "tkInt.h" #include <X11/Xlib.h> #include <X11/Xutil.h> #include <X11/Xatom.h> |