diff options
| author | jenglish <jenglish@flightlab.com> | 2007-01-11 19:59:26 (GMT) |
|---|---|---|
| committer | jenglish <jenglish@flightlab.com> | 2007-01-11 19:59:26 (GMT) |
| commit | c48f4f5bf3717299252cba2e4faa31f395ce1689 (patch) | |
| tree | 8277dd861a947f2adb0b4634f031f9c651f7e8d0 /generic/ttk/ttkNotebook.c | |
| parent | 72b0a491e8d2e18f644d6698540fbe79918d17ea (diff) | |
| download | tk-c48f4f5bf3717299252cba2e4faa31f395ce1689.zip tk-c48f4f5bf3717299252cba2e4faa31f395ce1689.tar.gz tk-c48f4f5bf3717299252cba2e4faa31f395ce1689.tar.bz2 | |
Revert previous change to keep in sync with Tile codebase.
The minor warnings from GCC fixed in the previous revision
were false positives due to improper use of "-Wconversion".
Still compiles cleanly with "gcc -Wall -Werror" (gcc 3.3.5).
Diffstat (limited to 'generic/ttk/ttkNotebook.c')
| -rw-r--r-- | generic/ttk/ttkNotebook.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/generic/ttk/ttkNotebook.c b/generic/ttk/ttkNotebook.c index 43aa541..a9596b9 100644 --- a/generic/ttk/ttkNotebook.c +++ b/generic/ttk/ttkNotebook.c @@ -1,4 +1,4 @@ -/* $Id: ttkNotebook.c,v 1.7 2007/01/11 15:35:40 dkf Exp $ +/* $Id: ttkNotebook.c,v 1.8 2007/01/11 19:59:26 jenglish Exp $ * Copyright (c) 2004, Joe English * * NOTE-ACTIVE: activeTabIndex is not always correct (it's @@ -672,15 +672,18 @@ static Ttk_ManagerSpec NotebookManagerSpec = /* NotebookEventHandler -- * Tracks the active tab. */ -static const unsigned NotebookEventMask = - StructureNotifyMask | PointerMotionMask | LeaveWindowMask; +static const int NotebookEventMask + = StructureNotifyMask + | PointerMotionMask + | LeaveWindowMask + ; static void NotebookEventHandler(ClientData clientData, XEvent *eventPtr) { Notebook *nb = clientData; if (eventPtr->type == DestroyNotify) { /* Remove self */ - Tk_DeleteEventHandler(nb->core.tkwin, NotebookEventMask, - NotebookEventHandler, clientData); + Tk_DeleteEventHandler(nb->core.tkwin, + NotebookEventMask, NotebookEventHandler, clientData); } else if (eventPtr->type == MotionNotify) { int index = IdentifyTab(nb, eventPtr->xmotion.x, eventPtr->xmotion.y); ActivateTab(nb, index); |