diff options
| author | culler <culler> | 2018-12-20 14:24:15 (GMT) |
|---|---|---|
| committer | culler <culler> | 2018-12-20 14:24:15 (GMT) |
| commit | a8e38d4f0a2001f03c453a3267e7785496f85359 (patch) | |
| tree | 51eacb3dd005bb406b879b6ddadacb8cb74b2c37 /win/tkWinMenu.c | |
| parent | f0ba2d7b3ec3c978c9433acfb4766978cbef6175 (diff) | |
| parent | e26cd8eb2b04a4bd764e382cbcbfe4b1030796c6 (diff) | |
| download | tk-a8e38d4f0a2001f03c453a3267e7785496f85359.zip tk-a8e38d4f0a2001f03c453a3267e7785496f85359.tar.gz tk-a8e38d4f0a2001f03c453a3267e7785496f85359.tar.bz2 | |
merge core-8-6-branch.
Diffstat (limited to 'win/tkWinMenu.c')
| -rw-r--r-- | win/tkWinMenu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/win/tkWinMenu.c b/win/tkWinMenu.c index a409764..b03cf6d 100644 --- a/win/tkWinMenu.c +++ b/win/tkWinMenu.c @@ -2364,7 +2364,7 @@ DrawMenuEntryLabel( XFillRectangle(menuPtr->display, d, menuPtr->disabledGC, x, y, (unsigned) width, (unsigned) height); } else if ((mePtr->image != NULL) - && (menuPtr->disabledImageGC != None)) { + && menuPtr->disabledImageGC) { XFillRectangle(menuPtr->display, d, menuPtr->disabledImageGC, leftEdge + imageXOffset, (int) (y + (mePtr->height - imageHeight)/2 + imageYOffset), @@ -3005,7 +3005,7 @@ MenuSelectEvent( Tk_MakeWindowExist(menuPtr->tkwin); event.event = Tk_WindowId(menuPtr->tkwin); event.root = XRootWindow(menuPtr->display, 0); - event.subwindow = None; + event.subwindow = 0; event.time = TkpGetMS(); root.msgpos = GetMessagePos(); |