diff options
| author | chengyemao <chengyemao> | 2005-01-13 01:48:03 (GMT) |
|---|---|---|
| committer | chengyemao <chengyemao> | 2005-01-13 01:48:03 (GMT) |
| commit | ebff7b1e30816294ee71671ab00e75f01366ef55 (patch) | |
| tree | 3ceb729aab2805d7cc5d11c28d1948872a10b294 | |
| parent | 8f1bd02c7e5f595b8e77e3e31d2a47fe2cbce2f9 (diff) | |
| download | tk-ebff7b1e30816294ee71671ab00e75f01366ef55.zip tk-ebff7b1e30816294ee71671ab00e75f01366ef55.tar.gz tk-ebff7b1e30816294ee71671ab00e75f01366ef55.tar.bz2 | |
Removed WM_UNINITMENUPOPUP that may cause compiling error in WINVER < 0x0500
| -rw-r--r-- | win/tkWinMenu.c | 9 | ||||
| -rw-r--r-- | win/tkWinWm.c | 3 |
2 files changed, 3 insertions, 9 deletions
diff --git a/win/tkWinMenu.c b/win/tkWinMenu.c index d7f5d48..9f922ca 100644 --- a/win/tkWinMenu.c +++ b/win/tkWinMenu.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: tkWinMenu.c,v 1.40 2005/01/09 06:59:20 chengyemao Exp $ + * RCS: @(#) $Id: tkWinMenu.c,v 1.41 2005/01/13 01:48:03 chengyemao Exp $ */ #define OEMRESOURCE @@ -932,7 +932,7 @@ TkWinEmbeddedMenuProc(hwnd, message, wParam, lParam) WPARAM wParam; LPARAM lParam; { - static nPopupMenus = 0, nIdles = 0; + static nIdles = 0; LRESULT lResult = 1; ThreadSpecificData *tsdPtr = (ThreadSpecificData *) Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); @@ -947,13 +947,8 @@ TkWinEmbeddedMenuProc(hwnd, message, wParam, lParam) case WM_INITMENUPOPUP: nIdles = 0; - nPopupMenus++; break; - case WM_UNINITMENUPOPUP: - nPopupMenus--; - break; - case WM_INITMENU: case WM_SYSCOMMAND: case WM_COMMAND: diff --git a/win/tkWinWm.c b/win/tkWinWm.c index 4a2738b..77a521b 100644 --- a/win/tkWinWm.c +++ b/win/tkWinWm.c @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWinWm.c,v 1.92 2005/01/12 02:58:29 chengyemao Exp $ + * RCS: @(#) $Id: tkWinWm.c,v 1.93 2005/01/13 01:48:03 chengyemao Exp $ */ #include "tkWinInt.h" @@ -7502,7 +7502,6 @@ WmProc(hwnd, message, wParam, lParam) case WM_MENUSELECT: case WM_ENTERIDLE: case WM_INITMENUPOPUP: - case WM_UNINITMENUPOPUP: { HWND hMenuHWnd = Tk_GetEmbeddedMenuHWND((Tk_Window)winPtr); if(hMenuHWnd) { |