diff options
author | jan.nijtmans <jan.nijtmans@noemail.net> | 2012-06-07 08:23:36 (GMT) |
---|---|---|
committer | jan.nijtmans <jan.nijtmans@noemail.net> | 2012-06-07 08:23:36 (GMT) |
commit | 73329e07e36947e3dad1aae2440a5b9b19a6d353 (patch) | |
tree | 4274efeb094e97e961ce012a435047200d6dbdd6 | |
parent | 53a8fa286f84fe054bef1be6a00c8adb2ce2d51d (diff) | |
download | tk-73329e07e36947e3dad1aae2440a5b9b19a6d353.zip tk-73329e07e36947e3dad1aae2440a5b9b19a6d353.tar.gz tk-73329e07e36947e3dad1aae2440a5b9b19a6d353.tar.bz2 |
eliminate some warnings, caused by previous merge
FossilOrigin-Name: cdce76242d5649ec60d76ac0a023b765a2551078
-rw-r--r-- | generic/tkIntPlatDecls.h | 2 | ||||
-rw-r--r-- | win/tkWinPointer.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/generic/tkIntPlatDecls.h b/generic/tkIntPlatDecls.h index 1e0a758..d0753f1 100644 --- a/generic/tkIntPlatDecls.h +++ b/generic/tkIntPlatDecls.h @@ -1191,6 +1191,8 @@ extern TkIntPlatStubs *tkIntPlatStubsPtr; #endif #ifdef __WIN32__ +#undef TkpCmapStressed +#undef TkpSync #define TkpCmapStressed(tkwin,colormap) (0) #define TkpSync(display) #endif diff --git a/win/tkWinPointer.c b/win/tkWinPointer.c index 7aec2b4..dcddb8f 100644 --- a/win/tkWinPointer.c +++ b/win/tkWinPointer.c @@ -360,6 +360,7 @@ XWarpPointer( GetWindowRect(Tk_GetHWND(dest_w), &r); SetCursorPos(r.left+dest_x, r.top+dest_y); + return Success; } /* |