diff options
| author | dgp <dgp@users.sourceforge.net> | 2007-12-05 20:26:46 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2007-12-05 20:26:46 (GMT) |
| commit | 052769d3429842c878d3f69a27ab2075e1cb44b8 (patch) | |
| tree | 2d9c8a2a6863dcac4a4cd219f9580c43b510b30e /win/tkWinButton.c | |
| parent | 8fb134c7b3563ffd9f518c2c75271ee5d2063998 (diff) | |
| download | tk-052769d3429842c878d3f69a27ab2075e1cb44b8.zip tk-052769d3429842c878d3f69a27ab2075e1cb44b8.tar.gz tk-052769d3429842c878d3f69a27ab2075e1cb44b8.tar.bz2 | |
merge updates from HEAD
Diffstat (limited to 'win/tkWinButton.c')
| -rw-r--r-- | win/tkWinButton.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/win/tkWinButton.c b/win/tkWinButton.c index 7a1ed35..b10d31c 100644 --- a/win/tkWinButton.c +++ b/win/tkWinButton.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWinButton.c,v 1.31 2007/01/11 15:35:40 dkf Exp $ + * RCS: @(#) $Id: tkWinButton.c,v 1.31.2.1 2007/12/05 20:26:46 dgp Exp $ */ #define OEMRESOURCE @@ -274,13 +274,8 @@ CreateProc( parent, NULL, Tk_GetHINSTANCE(), NULL); SetWindowPos(butPtr->hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE); -#ifdef _WIN64 butPtr->oldProc = (WNDPROC)SetWindowLongPtr(butPtr->hwnd, GWLP_WNDPROC, (LONG_PTR) ButtonProc); -#else - butPtr->oldProc = (WNDPROC)SetWindowLong(butPtr->hwnd, GWL_WNDPROC, - (DWORD) ButtonProc); -#endif window = Tk_AttachHWND(tkwin, butPtr->hwnd); return window; @@ -310,11 +305,7 @@ TkpDestroyButton( HWND hwnd = winButPtr->hwnd; if (hwnd) { -#ifdef _WIN64 SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG_PTR) winButPtr->oldProc); -#else - SetWindowLong(hwnd, GWL_WNDPROC, (DWORD) winButPtr->oldProc); -#endif } } |