diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-06-07 08:23:36 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-06-07 08:23:36 (GMT) |
commit | 3aa2c84455d3f19dcc554b7d45caa624f3f53e60 (patch) | |
tree | 4274efeb094e97e961ce012a435047200d6dbdd6 | |
parent | edb4cc7ce4e75ee2bd46f965f0724c54c134a1fd (diff) | |
download | tk-3aa2c84455d3f19dcc554b7d45caa624f3f53e60.zip tk-3aa2c84455d3f19dcc554b7d45caa624f3f53e60.tar.gz tk-3aa2c84455d3f19dcc554b7d45caa624f3f53e60.tar.bz2 |
eliminate some warnings, caused by previous merge
-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; } /* |