summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2008-10-20 11:18:07 (GMT)
committerdgp <dgp@users.sourceforge.net>2008-10-20 11:18:07 (GMT)
commitf63f84699c0ef9c0c0b4107c8eb067178380062d (patch)
treec243aca1df0b703216916e099e5b5afe51cb9e03
parente22830e4296c8c9c66fb6e418ad2a342487be067 (diff)
downloadtk-f63f84699c0ef9c0c0b4107c8eb067178380062d.zip
tk-f63f84699c0ef9c0c0b4107c8eb067178380062d.tar.gz
tk-f63f84699c0ef9c0c0b4107c8eb067178380062d.tar.bz2
fix compile errors and warnings
-rw-r--r--generic/tkBusy.c19
1 files changed, 10 insertions, 9 deletions
diff --git a/generic/tkBusy.c b/generic/tkBusy.c
index 36e8c35..8c1dd12 100644
--- a/generic/tkBusy.c
+++ b/generic/tkBusy.c
@@ -11,11 +11,12 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkBusy.c,v 1.2 2008/10/20 10:50:20 dkf Exp $
+ * RCS: @(#) $Id: tkBusy.c,v 1.3 2008/10/20 11:18:07 dgp Exp $
*/
#include "tkInt.h"
#include "tkBusy.h"
+#include "default.h"
/*
* Things about the busy system that may be configured. Note that currently on
@@ -135,7 +136,7 @@ BusyCustodyProc(
Tk_DeleteEventHandler(busyPtr->tkBusy, StructureNotifyMask, BusyEventProc,
busyPtr);
- TkpHideBusyWindow(busyPtr);
+ TkpHideBusyWindow((TkBusy)busyPtr);
busyPtr->tkBusy = NULL;
Tcl_EventuallyFree(busyPtr, DestroyBusy);
}
@@ -295,20 +296,20 @@ RefWinEventProc(
if (busyPtr->tkBusy != NULL) {
Tk_MoveResizeWindow(busyPtr->tkBusy, x, y, busyPtr->width,
busyPtr->height);
- TkpShowBusyWindow(busyPtr);
+ TkpShowBusyWindow((TkBusy)busyPtr);
}
}
break;
case MapNotify:
if (busyPtr->tkParent != busyPtr->tkRef) {
- TkpShowBusyWindow(busyPtr);
+ TkpShowBusyWindow((TkBusy)busyPtr);
}
break;
case UnmapNotify:
if (busyPtr->tkParent != busyPtr->tkRef) {
- TkpHideBusyWindow(busyPtr);
+ TkpHideBusyWindow((TkBusy)busyPtr);
}
break;
}
@@ -577,7 +578,7 @@ CreateBusy(
SetWindowInstanceData(tkBusy, busyPtr);
winPtr = (Tk_FakeWin *) tkRef;
- TkpCreateBusy(winPtr, tkRef, &parent, tkParent, busyPtr);
+ TkpCreateBusy(winPtr, tkRef, &parent, tkParent, (TkBusy)busyPtr);
MakeTransparentWindowExist(tkBusy, parent);
@@ -756,9 +757,9 @@ HoldBusy(
*/
if (Tk_IsMapped(busyPtr->tkRef)) {
- TkpShowBusyWindow(busyPtr);
+ TkpShowBusyWindow((TkBusy)busyPtr);
} else {
- TkpHideBusyWindow(busyPtr);
+ TkpHideBusyWindow((TkBusy)busyPtr);
}
return result;
}
@@ -892,7 +893,7 @@ Tk_BusyObjCmd(
if (GetBusy(busyTablePtr, interp, objv[3], &busyPtr) != TCL_OK) {
return TCL_ERROR;
}
- TkpHideBusyWindow(busyPtr);
+ TkpHideBusyWindow((TkBusy)busyPtr);
Tcl_EventuallyFree(busyPtr, DestroyBusy);
return TCL_OK;