Menu
▾
▴
[TCLCORE] Re: [TCLCORE] Welcome!
|
From: Mo D. <md...@cy...> - 2000-07-06 01:04:18
|
Wasting no time, mo submits a patch for approval.
Mo DeJong
Red Hat Inc
Index: ChangeLog
===================================================================
RCS file: /cvsroot/tk/ChangeLog,v
retrieving revision 1.167
diff -u -r1.167 ChangeLog
--- ChangeLog 2000/06/30 20:33:44 1.167
+++ ChangeLog 2000/07/06 01:03:27
@@ -1,3 +1,19 @@
+2000-07-05 Mo DeJong <md...@re...>
+
+ * 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-06-30 Eric Melski <er...@sc...>
* doc/keysyms.n:
Index: generic/tkFileFilter.c
===================================================================
RCS file: /cvsroot/tk/generic/tkFileFilter.c,v
retrieving revision 1.3
diff -u -r1.3 tkFileFilter.c
--- tkFileFilter.c 1999/04/16 01:51:13 1.3
+++ tkFileFilter.c 2000/07/06 00:59:40
@@ -270,7 +270,7 @@
/*
* 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 @@
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]);
}
Index: win/stubs.c
===================================================================
RCS file: /cvsroot/tk/win/stubs.c,v
retrieving revision 1.2
diff -u -r1.2 stubs.c
--- stubs.c 1999/06/16 20:11:30 1.2
+++ stubs.c 2000/07/06 00:59:42
@@ -4,7 +4,7 @@
* Undocumented Xlib internal function
*/
-_XInitImageFuncPtrs(XImage *image)
+int _XInitImageFuncPtrs(XImage *image)
{
return 0;
}
Index: win/tkWinButton.c
===================================================================
RCS file: /cvsroot/tk/win/tkWinButton.c,v
retrieving revision 1.9
diff -u -r1.9 tkWinButton.c
--- tkWinButton.c 2000/05/17 21:17:22 1.9
+++ tkWinButton.c 2000/07/06 00:59:42
@@ -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 @@
/*
* 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));
Index: win/tkWinColor.c
===================================================================
RCS file: /cvsroot/tk/win/tkWinColor.c,v
retrieving revision 1.5
diff -u -r1.5 tkWinColor.c
--- tkWinColor.c 2000/04/17 06:26:09 1.5
+++ tkWinColor.c 2000/07/06 00:59:42
@@ -80,8 +80,6 @@
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));
/*
*----------------------------------------------------------------------
Index: win/tkWinDialog.c
===================================================================
RCS file: /cvsroot/tk/win/tkWinDialog.c,v
retrieving revision 1.12
diff -u -r1.12 tkWinDialog.c
--- tkWinDialog.c 2000/06/15 16:01:04 1.12
+++ tkWinDialog.c 2000/07/06 00:59:42
@@ -123,7 +123,6 @@
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);
/*
*-------------------------------------------------------------------------
Index: win/tkWinEmbed.c
===================================================================
RCS file: /cvsroot/tk/win/tkWinEmbed.c,v
retrieving revision 1.3
diff -u -r1.3 tkWinEmbed.c
--- tkWinEmbed.c 1999/04/16 01:51:51 1.3
+++ tkWinEmbed.c 2000/07/06 00:59:42
@@ -397,7 +397,7 @@
break;
case TK_GEOMETRYREQ:
- EmbedGeometryRequest(containerPtr, wParam, lParam);
+ EmbedGeometryRequest(containerPtr, (int) wParam, lParam);
break;
}
return 1;
Index: win/tkWinMenu.c
===================================================================
RCS file: /cvsroot/tk/win/tkWinMenu.c,v
retrieving revision 1.10
diff -u -r1.10 tkWinMenu.c
--- tkWinMenu.c 2000/05/16 17:57:32 1.10
+++ tkWinMenu.c 2000/07/06 00:59:42
@@ -82,8 +82,6 @@
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 @@
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,
Index: win/tkWinWindow.c
===================================================================
RCS file: /cvsroot/tk/win/tkWinWindow.c,v
retrieving revision 1.5
diff -u -r1.5 tkWinWindow.c
--- tkWinWindow.c 1999/04/16 01:51:54 1.5
+++ tkWinWindow.c 2000/07/06 00:59:42
@@ -27,8 +27,6 @@
static void NotifyVisibility _ANSI_ARGS_((XEvent *eventPtr,
TkWindow *winPtr));
-static void StackWindow _ANSI_ARGS_((Window w, Window sibling,
- int stack_mode));
/*
*----------------------------------------------------------------------
Index: win/tkWinWm.c
===================================================================
RCS file: /cvsroot/tk/win/tkWinWm.c,v
retrieving revision 1.25
diff -u -r1.25 tkWinWm.c
--- tkWinWm.c 2000/05/16 00:00:29 1.25
+++ tkWinWm.c 2000/07/06 00:59:43
@@ -276,8 +276,6 @@
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));
Index: win/tkWinX.c
===================================================================
RCS file: /cvsroot/tk/win/tkWinX.c,v
retrieving revision 1.10
diff -u -r1.10 tkWinX.c
--- tkWinX.c 2000/04/19 01:06:51 1.10
+++ tkWinX.c 2000/07/06 00:59:43
@@ -31,8 +31,6 @@
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
Index: xlib/ximage.c
===================================================================
RCS file: /cvsroot/tk/xlib/ximage.c,v
retrieving revision 1.3
diff -u -r1.3 ximage.c
--- ximage.c 1998/09/14 18:24:03 1.3
+++ ximage.c 2000/07/06 00:59:43
@@ -47,7 +47,7 @@
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;
--
The TclCore mailing list is sponsored by Ajuba Solutions
To unsubscribe: email tcl...@aj... with the
word UNSUBSCRIBE as the subject.
|
