Skip to content

Commit 9615205

Browse files
author
jan.nijtmans
committed
Fix many -Wconversion compiler warnings
1 parent 70b36c9 commit 9615205

24 files changed

+166
-163
lines changed

‎generic/tkInt.decls‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ declare 54 {
212212
double width, int filled, double pointPtr[])
213213
}
214214
declare 55 {
215-
int TkpChangeFocus(TkWindow *winPtr, int force)
215+
size_t TkpChangeFocus(TkWindow *winPtr, int force)
216216
}
217217
declare 56 {
218218
void TkpCloseDisplay(TkDisplay *dispPtr)
@@ -718,7 +718,7 @@ declare 16 win {
718718
HDC TkWinGetDrawableDC(Display *display, Drawable d, TkWinDCState *state)
719719
}
720720
declare 17 win {
721-
int TkWinGetModifierState(void)
721+
unsigned int TkWinGetModifierState(void)
722722
}
723723
declare 18 win {
724724
HPALETTE TkWinGetSystemPalette(void)

‎generic/tkIntDecls.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ EXTERN int TkOvalToArea(double *ovalPtr, double *rectPtr);
193193
EXTERN double TkOvalToPoint(double ovalPtr[], double width,
194194
int filled, double pointPtr[]);
195195
/* 55 */
196-
EXTERN int TkpChangeFocus(TkWindow *winPtr, int force);
196+
EXTERN size_t TkpChangeFocus(TkWindow *winPtr, int force);
197197
/* 56 */
198198
EXTERN void TkpCloseDisplay(TkDisplay *dispPtr);
199199
/* 57 */
@@ -605,7 +605,7 @@ typedef struct TkIntStubs {
605605
void (*tkOptionDeadWindow) (TkWindow *winPtr); /* 52 */
606606
int (*tkOvalToArea) (double *ovalPtr, double *rectPtr); /* 53 */
607607
double (*tkOvalToPoint) (double ovalPtr[], double width, int filled, double pointPtr[]); /* 54 */
608-
int (*tkpChangeFocus) (TkWindow *winPtr, int force); /* 55 */
608+
size_t (*tkpChangeFocus) (TkWindow *winPtr, int force); /* 55 */
609609
void (*tkpCloseDisplay) (TkDisplay *dispPtr); /* 56 */
610610
void (*tkpClaimFocus) (TkWindow *topLevelPtr, int force); /* 57 */
611611
void (*tkpDisplayWarning) (const char *msg, const char *title); /* 58 */

‎generic/tkIntPlatDecls.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ EXTERN COLORREF TkWinGetBorderPixels(Tk_Window tkwin,
7575
EXTERN HDC TkWinGetDrawableDC(Display *display, Drawable d,
7676
TkWinDCState *state);
7777
/* 17 */
78-
EXTERN int TkWinGetModifierState(void);
78+
EXTERN unsigned int TkWinGetModifierState(void);
7979
/* 18 */
8080
EXTERN HPALETTE TkWinGetSystemPalette(void);
8181
/* 19 */
@@ -332,7 +332,7 @@ typedef struct TkIntPlatStubs {
332332
void (*tkWinFillRect) (HDC dc, int x, int y, int width, int height, int pixel); /* 14 */
333333
COLORREF (*tkWinGetBorderPixels) (Tk_Window tkwin, Tk_3DBorder border, int which); /* 15 */
334334
HDC (*tkWinGetDrawableDC) (Display *display, Drawable d, TkWinDCState *state); /* 16 */
335-
int (*tkWinGetModifierState) (void); /* 17 */
335+
unsigned int (*tkWinGetModifierState) (void); /* 17 */
336336
HPALETTE (*tkWinGetSystemPalette) (void); /* 18 */
337337
HWND (*tkWinGetWrapperWindow) (Tk_Window tkwin); /* 19 */
338338
int (*tkWinHandleMenuEvent) (HWND *phwnd, UINT *pMessage, WPARAM *pwParam, LPARAM *plParam, LRESULT *plResult); /* 20 */

‎macosx/tkMacOSXWm.c‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7243,17 +7243,16 @@ XSetInputFocus(
72437243
*----------------------------------------------------------------------
72447244
*/
72457245

7246-
int
7246+
size_t
72477247
TkpChangeFocus(
72487248
TkWindow *winPtr, /* Window that is to receive the X focus. */
72497249
int force) /* Non-zero means claim the focus even if it
72507250
* didn't originally belong to topLevelPtr's
72517251
* application. */
72527252
{
7253-
if (!winPtr ||
7254-
(winPtr->flags & TK_ALREADY_DEAD) ||
7255-
!Tk_IsMapped(winPtr) ||
7256-
winPtr->atts.override_redirect) {
7253+
if (!winPtr || (winPtr->flags & TK_ALREADY_DEAD)
7254+
|| !Tk_IsMapped(winPtr) ||
7255+
winPtr->atts.override_redirect) {
72577256
return 0;
72587257
}
72597258
if (Tk_IsTopLevel(winPtr) && !Tk_IsEmbedded(winPtr)) {

‎unix/tkUnix.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -201,9 +201,9 @@ TkpBuildRegionFromAlphaData(
201201
lineDataPtr += pixelStride;
202202
}
203203
if (end > x1) {
204-
rect.x = x + x1;
205-
rect.y = y + y1;
206-
rect.width = end - x1;
204+
rect.x = (short)(x + x1);
205+
rect.y = (short)(y + y1);
206+
rect.width = (unsigned short)(end - x1);
207207
rect.height = 1;
208208
TkUnionRectWithRegion(&rect, region, region);
209209
}
@@ -261,7 +261,7 @@ Tk_GetUserInactiveTime(
261261
Tcl_Panic("Out of memory: XScreenSaverAllocInfo failed in Tk_GetUserInactiveTime");
262262
}
263263
if (XScreenSaverQueryInfo(dpy, DefaultRootWindow(dpy), info)) {
264-
inactiveTime = info->idle;
264+
inactiveTime = (long)info->idle;
265265
}
266266
XFree(info);
267267
}

‎unix/tkUnixDraw.c‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -137,10 +137,10 @@ ScrollRestrictProc(
137137
if (eventPtr->type == NoExpose) {
138138
info->done = 1;
139139
} else if (eventPtr->type == GraphicsExpose) {
140-
rect.x = eventPtr->xgraphicsexpose.x;
141-
rect.y = eventPtr->xgraphicsexpose.y;
142-
rect.width = eventPtr->xgraphicsexpose.width;
143-
rect.height = eventPtr->xgraphicsexpose.height;
140+
rect.x = (short)eventPtr->xgraphicsexpose.x;
141+
rect.y = (short)eventPtr->xgraphicsexpose.y;
142+
rect.width = (unsigned short)eventPtr->xgraphicsexpose.width;
143+
rect.height = (unsigned short)eventPtr->xgraphicsexpose.height;
144144
XUnionRectWithRegion(&rect, info->region,
145145
info->region);
146146

@@ -156,14 +156,14 @@ ScrollRestrictProc(
156156
* area as damaged.
157157
*/
158158

159-
rect.x = eventPtr->xexpose.x;
160-
rect.y = eventPtr->xexpose.y;
161-
rect.width = eventPtr->xexpose.width;
162-
rect.height = eventPtr->xexpose.height;
159+
rect.x = (short)eventPtr->xexpose.x;
160+
rect.y = (short)eventPtr->xexpose.y;
161+
rect.width = (unsigned short)eventPtr->xexpose.width;
162+
rect.height = (unsigned short)eventPtr->xexpose.height;
163163
XUnionRectWithRegion(&rect, info->region,
164164
info->region);
165-
rect.x += info->dx;
166-
rect.y += info->dy;
165+
rect.x += (short)info->dx;
166+
rect.y += (short)info->dy;
167167
XUnionRectWithRegion(&rect, info->region,
168168
info->region);
169169
} else {

‎unix/tkUnixEmbed.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1129,7 +1129,7 @@ TkpMakeTransparentWindowExist(
11291129
Window parent) /* Parent window. */
11301130
{
11311131
TkWindow *winPtr = (TkWindow *) tkwin;
1132-
long int mask = CWDontPropagate | CWEventMask;
1132+
unsigned long mask = CWDontPropagate | CWEventMask;
11331133

11341134
/*
11351135
* Ignore the important events while the window is mapped.

‎unix/tkUnixEvent.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -184,13 +184,13 @@ TkpOpenDisplay(
184184
if (WidthMMOfScreen(DefaultScreenOfDisplay(display)) <= 0) {
185185
int mm;
186186

187-
mm = WidthOfScreen(DefaultScreenOfDisplay(display)) * (25.4 / 75.0);
187+
mm = (int)(WidthOfScreen(DefaultScreenOfDisplay(display)) * (25.4 / 75.0));
188188
WidthMMOfScreen(DefaultScreenOfDisplay(display)) = mm;
189189
}
190190
if (HeightMMOfScreen(DefaultScreenOfDisplay(display)) <= 0) {
191191
int mm;
192192

193-
mm = HeightOfScreen(DefaultScreenOfDisplay(display)) * (25.4 / 75.0);
193+
mm = (int)(HeightOfScreen(DefaultScreenOfDisplay(display)) * (25.4 / 75.0));
194194
HeightMMOfScreen(DefaultScreenOfDisplay(display)) = mm;
195195
}
196196

@@ -592,8 +592,8 @@ TkUnixDoOneXEvent(
592592
blockTime.tv_usec = 0;
593593
}
594594
fd = ConnectionNumber(dispPtr->display);
595-
index = fd/(NBBY*sizeof(fd_mask));
596-
bit = ((fd_mask)1) << (fd%(NBBY*sizeof(fd_mask)));
595+
index = fd/(NBBY*(int)sizeof(fd_mask));
596+
bit = ((fd_mask)1) << (fd%(NBBY*(int)sizeof(fd_mask)));
597597
readMask[index] |= bit;
598598
if (numFdBits <= fd) {
599599
numFdBits = fd+1;
@@ -618,8 +618,8 @@ TkUnixDoOneXEvent(
618618
for (dispPtr = TkGetDisplayList(); dispPtr != NULL;
619619
dispPtr = dispPtr->nextPtr) {
620620
fd = ConnectionNumber(dispPtr->display);
621-
index = fd/(NBBY*sizeof(fd_mask));
622-
bit = ((fd_mask)1) << (fd%(NBBY*sizeof(fd_mask)));
621+
index = fd/(NBBY*(int)sizeof(fd_mask));
622+
bit = ((fd_mask)1) << (fd%(NBBY*(int)sizeof(fd_mask)));
623623
if ((readMask[index] & bit) || (QLength(dispPtr->display) > 0)) {
624624
DisplayFileProc(dispPtr, TCL_READABLE);
625625
}

‎unix/tkUnixFocus.c‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
*----------------------------------------------------------------------
3535
*/
3636

37-
int
37+
size_t
3838
TkpChangeFocus(
3939
TkWindow *winPtr, /* Window that is to receive the X focus. */
4040
int force) /* Non-zero means claim the focus even if it
@@ -44,7 +44,8 @@ TkpChangeFocus(
4444
TkDisplay *dispPtr = winPtr->dispPtr;
4545
Tk_ErrorHandler errHandler;
4646
Window window, root, parent, *children;
47-
unsigned int numChildren, serial;
47+
unsigned int numChildren;
48+
size_t serial;
4849
TkWindow *winPtr2;
4950
int dummy;
5051

‎unix/tkUnixPrint.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#ifdef HAVE_CUPS
1616
#include <cups/cups.h>
1717

18-
typedef int (CupsSubCmdOp)(Tcl_Interp *, int, Tcl_Obj *const []);
18+
typedef int (CupsSubCmdOp)(Tcl_Interp *, Tcl_Size, Tcl_Obj *const []);
1919

2020
static Tcl_ObjCmdProc2 Cups_Cmd;
2121
static CupsSubCmdOp DefaultPrinterOp;
@@ -85,7 +85,7 @@ Cups_Cmd(
8585
static int
8686
DefaultPrinterOp(
8787
Tcl_Interp *interp,
88-
TCL_UNUSED(int),
88+
TCL_UNUSED(Tcl_Size),
8989
TCL_UNUSED(Tcl_Obj *const *))
9090
{
9191
cups_dest_t *printer;
@@ -109,7 +109,7 @@ DefaultPrinterOp(
109109
static int
110110
GetPrintersOp(
111111
Tcl_Interp *interp,
112-
int objc,
112+
Tcl_Size objc,
113113
Tcl_Obj *const objv[])
114114
{
115115
cups_dest_t *dests;
@@ -197,7 +197,7 @@ static const struct ParseData {
197197
static int
198198
PrintOp(
199199
Tcl_Interp *interp,
200-
int objc,
200+
Tcl_Size objc,
201201
Tcl_Obj *const objv[])
202202
{
203203
cups_dest_t *printer;

0 commit comments

Comments
 (0)