From 8ea696f3623c8f3df9b570f448c1fefedf4ff750 Mon Sep 17 00:00:00 2001 From: mo Date: Thu, 6 Jul 2000 03:17:43 +0000 Subject: * generic/tkFileFilter.c (AddClause): Cast to match function prototype. * win/stubs.c (_XInitImageFuncPtrs): Add return value for function. * win/tkWinButton.c (buttonStyles, ButtonBindProc, ComputeStyle): Remove unused declarations. * win/tkWinColor.c (GetColorByName, GetColorByValue): Remove unused function declarations. * win/tkWinDialog.c (TrySetDirectory): Remove unused function declaration. * win/tkWinEmbed.c (TkWinEmbeddedEventProc): Cast to match function prototype. * win/tkWinMenu.c (winMenuMutex, MenuExitProc): Remove unused declaration. * win/tkWinWindow.c (StackWindow): Remove unused declaration. * win/tkWinWm.c (ConfigureEvent): Remove unused declaration. * win/tkWinX.c (winXMutex): Remove unused declaration. * xlib/ximage.c (XCreateBitmapFromData): Cast to match function prototype. --- ChangeLog | 16 ++++++++++++++++ generic/tkFileFilter.c | 8 ++++---- win/stubs.c | 2 +- win/tkWinButton.c | 11 +---------- win/tkWinColor.c | 4 +--- win/tkWinDialog.c | 3 +-- win/tkWinEmbed.c | 4 ++-- win/tkWinMenu.c | 5 +---- win/tkWinWindow.c | 4 +--- win/tkWinWm.c | 4 +--- win/tkWinX.c | 4 +--- xlib/ximage.c | 4 ++-- 12 files changed, 32 insertions(+), 37 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0fe3baf..5e8ce33 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2000-07-05 Mo DeJong + + * generic/tkFileFilter.c (AddClause): Cast to match function prototype. + * win/stubs.c (_XInitImageFuncPtrs): Add return value for function. + * win/tkWinButton.c (buttonStyles, ButtonBindProc, ComputeStyle): + Remove unused declarations. + * win/tkWinColor.c (GetColorByName, GetColorByValue): Remove unused + function declarations. + * win/tkWinDialog.c (TrySetDirectory): Remove unused function declaration. + * win/tkWinEmbed.c (TkWinEmbeddedEventProc): Cast to match function prototype. + * win/tkWinMenu.c (winMenuMutex, MenuExitProc): Remove unused declaration. + * win/tkWinWindow.c (StackWindow): Remove unused declaration. + * win/tkWinWm.c (ConfigureEvent): Remove unused declaration. + * win/tkWinX.c (winXMutex): Remove unused declaration. + * xlib/ximage.c (XCreateBitmapFromData): Cast to match function prototype. + 2000-07-05 Eric Melski * tests/imgPhoto.test: Added test for GIF writing code [Bug: 5823]. diff --git a/generic/tkFileFilter.c b/generic/tkFileFilter.c index 0528351..b9bebd7 100644 --- a/generic/tkFileFilter.c +++ b/generic/tkFileFilter.c @@ -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.c,v 1.3 1999/04/16 01:51:13 stanton Exp $ + * RCS: @(#) $Id: tkFileFilter.c,v 1.4 2000/07/06 03:17:43 mo Exp $ */ #include "tkInt.h" @@ -270,7 +270,7 @@ static int AddClause(interp, filterPtr, patternsStr, ostypesStr, isWindows) /* * Prepend a "*" to patterns that do not have a leading "*" */ - globPtr->pattern = (char*)ckalloc(len+1); + globPtr->pattern = (char*)ckalloc((unsigned int) len+1); globPtr->pattern[0] = '*'; strcpy(globPtr->pattern+1, globList[i]); } @@ -289,11 +289,11 @@ static int AddClause(interp, filterPtr, patternsStr, ostypesStr, isWindows) strcpy(globPtr->pattern, "*."); } else { - globPtr->pattern = (char*)ckalloc(len); + globPtr->pattern = (char*)ckalloc((unsigned int) len); strcpy(globPtr->pattern, globList[i]); } } else { - globPtr->pattern = (char*)ckalloc(len); + globPtr->pattern = (char*)ckalloc((unsigned int) len); strcpy(globPtr->pattern, globList[i]); } diff --git a/win/stubs.c b/win/stubs.c index e827b0f..60d2dc8 100644 --- a/win/stubs.c +++ b/win/stubs.c @@ -4,7 +4,7 @@ * Undocumented Xlib internal function */ -_XInitImageFuncPtrs(XImage *image) +int _XInitImageFuncPtrs(XImage *image) { return 0; } diff --git a/win/tkWinButton.c b/win/tkWinButton.c index b7acb47..aa35dd7 100644 --- a/win/tkWinButton.c +++ b/win/tkWinButton.c @@ -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: tkWinButton.c,v 1.9 2000/05/17 21:17:22 ericm Exp $ + * RCS: @(#) $Id: tkWinButton.c,v 1.10 2000/07/06 03:17:44 mo Exp $ */ #define OEMRESOURCE @@ -25,10 +25,6 @@ #define CHECK_STYLE (BS_OWNERDRAW | BS_CHECKBOX | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS) #define RADIO_STYLE (BS_OWNERDRAW | BS_RADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS) -static DWORD buttonStyles[] = { - LABEL_STYLE, PUSH_STYLE, CHECK_STYLE, RADIO_STYLE -}; - /* * Declaration of Windows specific button structure. */ @@ -83,13 +79,8 @@ static Tcl_ThreadDataKey dataKey; /* * Declarations for functions defined in this file. */ - -static int ButtonBindProc _ANSI_ARGS_((ClientData clientData, - Tcl_Interp *interp, XEvent *eventPtr, - Tk_Window tkwin, KeySym keySym)); static LRESULT CALLBACK ButtonProc _ANSI_ARGS_((HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)); -static DWORD ComputeStyle _ANSI_ARGS_((WinButton* butPtr)); static Window CreateProc _ANSI_ARGS_((Tk_Window tkwin, Window parent, ClientData instanceData)); static void InitBoxes _ANSI_ARGS_((void)); diff --git a/win/tkWinColor.c b/win/tkWinColor.c index d3d8caf..4bfd519 100644 --- a/win/tkWinColor.c +++ b/win/tkWinColor.c @@ -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: tkWinColor.c,v 1.5 2000/04/17 06:26:09 hobbs Exp $ + * RCS: @(#) $Id: tkWinColor.c,v 1.6 2000/07/06 03:17:44 mo Exp $ */ #include "tkWinInt.h" @@ -80,8 +80,6 @@ static Tcl_ThreadDataKey dataKey; static int FindSystemColor _ANSI_ARGS_((const char *name, XColor *colorPtr, int *indexPtr)); -static int GetColorByName _ANSI_ARGS_((char *name, XColor *color)); -static int GetColorByValue _ANSI_ARGS_((char *value, XColor *color)); /* *---------------------------------------------------------------------- diff --git a/win/tkWinDialog.c b/win/tkWinDialog.c index 67f57b4..0e49839 100644 --- a/win/tkWinDialog.c +++ b/win/tkWinDialog.c @@ -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: tkWinDialog.c,v 1.12 2000/06/15 16:01:04 ericm Exp $ + * RCS: @(#) $Id: tkWinDialog.c,v 1.13 2000/07/06 03:17:44 mo Exp $ * */ @@ -123,7 +123,6 @@ static UINT APIENTRY OFNHookProc(HWND hdlg, UINT uMsg, WPARAM wParam, static UINT APIENTRY OFNHookProcW(HWND hdlg, UINT uMsg, WPARAM wParam, LPARAM lParam); static void SetTkDialog(ClientData clientData); -static int TrySetDirectory(HWND hwnd, const TCHAR *dir); /* *------------------------------------------------------------------------- diff --git a/win/tkWinEmbed.c b/win/tkWinEmbed.c index 1cc4057..6fdcfc6 100644 --- a/win/tkWinEmbed.c +++ b/win/tkWinEmbed.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: tkWinEmbed.c,v 1.3 1999/04/16 01:51:51 stanton Exp $ + * RCS: @(#) $Id: tkWinEmbed.c,v 1.4 2000/07/06 03:17:44 mo Exp $ */ #include "tkWinInt.h" @@ -397,7 +397,7 @@ TkWinEmbeddedEventProc(hwnd, message, wParam, lParam) break; case TK_GEOMETRYREQ: - EmbedGeometryRequest(containerPtr, wParam, lParam); + EmbedGeometryRequest(containerPtr, (int) wParam, lParam); break; } return 1; diff --git a/win/tkWinMenu.c b/win/tkWinMenu.c index de622f9..7dd0458 100644 --- a/win/tkWinMenu.c +++ b/win/tkWinMenu.c @@ -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: tkWinMenu.c,v 1.10 2000/05/16 17:57:32 ericm Exp $ + * RCS: @(#) $Id: tkWinMenu.c,v 1.11 2000/07/06 03:17:44 mo Exp $ */ #define OEMRESOURCE @@ -82,8 +82,6 @@ static int defaultBorderWidth; /* The windows default border width. */ static Tcl_DString menuFontDString; /* A buffer to store the default menu font * string. */ -TCL_DECLARE_MUTEX(winMenuMutex) - /* * Forward declarations for procedures defined later in this file: */ @@ -149,7 +147,6 @@ static void GetTearoffEntryGeometry _ANSI_ARGS_((TkMenu *menuPtr, int *heightPtr)); static int GetNewID _ANSI_ARGS_((TkMenuEntry *mePtr, int *menuIDPtr)); -static void MenuExitProc _ANSI_ARGS_((ClientData clientData)); static int MenuKeyBindProc _ANSI_ARGS_(( ClientData clientData, Tcl_Interp *interp, XEvent *eventPtr, diff --git a/win/tkWinWindow.c b/win/tkWinWindow.c index 1b0e7a4..e2fa95b 100644 --- a/win/tkWinWindow.c +++ b/win/tkWinWindow.c @@ -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: tkWinWindow.c,v 1.5 1999/04/16 01:51:54 stanton Exp $ + * RCS: @(#) $Id: tkWinWindow.c,v 1.6 2000/07/06 03:17:45 mo Exp $ */ #include "tkWinInt.h" @@ -27,8 +27,6 @@ static Tcl_ThreadDataKey dataKey; static void NotifyVisibility _ANSI_ARGS_((XEvent *eventPtr, TkWindow *winPtr)); -static void StackWindow _ANSI_ARGS_((Window w, Window sibling, - int stack_mode)); /* *---------------------------------------------------------------------- diff --git a/win/tkWinWm.c b/win/tkWinWm.c index b4e1ed7..fdfc4cf 100644 --- a/win/tkWinWm.c +++ b/win/tkWinWm.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: tkWinWm.c,v 1.25 2000/05/16 00:00:29 hobbs Exp $ + * RCS: @(#) $Id: tkWinWm.c,v 1.26 2000/07/06 03:17:45 mo Exp $ */ #include "tkWinInt.h" @@ -276,8 +276,6 @@ TCL_DECLARE_MUTEX(winWmMutex) static int ActivateWindow _ANSI_ARGS_((Tcl_Event *evPtr, int flags)); -static void ConfigureEvent _ANSI_ARGS_((TkWindow *winPtr, - XConfigureEvent *eventPtr)); static void ConfigureTopLevel _ANSI_ARGS_((WINDOWPOS *pos)); static void GenerateConfigureNotify _ANSI_ARGS_(( TkWindow *winPtr)); diff --git a/win/tkWinX.c b/win/tkWinX.c index 5c2e3b4..0325df7 100644 --- a/win/tkWinX.c +++ b/win/tkWinX.c @@ -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: tkWinX.c,v 1.10 2000/04/19 01:06:51 ericm Exp $ + * RCS: @(#) $Id: tkWinX.c,v 1.11 2000/07/06 03:17:45 mo Exp $ */ #include "tkWinInt.h" @@ -31,8 +31,6 @@ static int childClassInitialized; /* Registered child class? */ static WNDCLASS childClass; /* Window class for child windows. */ static int tkPlatformId; /* version of Windows platform */ -TCL_DECLARE_MUTEX(winXMutex) - /* * Thread local storage. Notice that now each thread must have its * own TkDisplay structure, since this structure contains most of diff --git a/xlib/ximage.c b/xlib/ximage.c index b1367e9..d2214ba 100644 --- a/xlib/ximage.c +++ b/xlib/ximage.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: ximage.c,v 1.3 1998/09/14 18:24:03 stanton Exp $ + * RCS: @(#) $Id: ximage.c,v 1.4 2000/07/06 03:17:45 mo Exp $ */ #include "tkInt.h" @@ -47,7 +47,7 @@ XCreateBitmapFromData(display, d, data, width, height) GC gc; Pixmap pix; - pix = Tk_GetPixmap(display, d, width, height, 1); + pix = Tk_GetPixmap(display, d, (int) width, (int) height, 1); gc = XCreateGC(display, pix, 0, NULL); if (gc == NULL) { return None; -- cgit v0.12