diff options
| author | hobbs <hobbs@noemail.net> | 2007-12-05 19:07:59 (GMT) |
|---|---|---|
| committer | hobbs <hobbs@noemail.net> | 2007-12-05 19:07:59 (GMT) |
| commit | 05bc2eeb5cc4faebb0fcbd37d4e95f682a06027d (patch) | |
| tree | 669e1fed3026d9e8eccee0fd82963040db2e2129 /win/tkWinButton.c | |
| parent | b6fa853321ea075420b222951e75712d734d0653 (diff) | |
| download | tk-05bc2eeb5cc4faebb0fcbd37d4e95f682a06027d.zip tk-05bc2eeb5cc4faebb0fcbd37d4e95f682a06027d.tar.gz tk-05bc2eeb5cc4faebb0fcbd37d4e95f682a06027d.tar.bz2 | |
* win/tkWinButton.c, win/tkWinDialog.c: use SetWindowLongPtr and
* win/tkWinScrlbr.c, win/tkWinWm.c: GetWindowLongPtr only.
* win/ttkWinMonitor.c:
FossilOrigin-Name: cd313364da3ae8c04f92ed28df419a2e5c5ec07c
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..63ccf24 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.32 2007/12/05 19:08:00 hobbs 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 } } |