diff options
| author | Henrik Kinnunen <fluxgen@fluxbox.org> | 2008-09-28 08:53:16 (GMT) |
|---|---|---|
| committer | Henrik Kinnunen <fluxgen@fluxbox.org> | 2008-09-28 08:53:16 (GMT) |
| commit | f2c8868724ebcaa6afaac4a71093f77b7eeaa23f (patch) | |
| tree | e64111d54d58f819e261f4fa552fae8e111b30e8 /src/FbTk/EventManager.hh | |
| parent | bcf37890b617730cfded161b9a3d18f7c377e724 (diff) | |
| parent | 04a1d2a83b96eb6d1b1958e4f3e25ffdf295aa4d (diff) | |
| download | fluxbox-f2c8868724ebcaa6afaac4a71093f77b7eeaa23f.zip fluxbox-f2c8868724ebcaa6afaac4a71093f77b7eeaa23f.tar.bz2 | |
Merge branch 'master' of fluxbox@git.fluxbox.org:fluxbox
Conflicts:
ChangeLog
Diffstat (limited to 'src/FbTk/EventManager.hh')
| -rw-r--r-- | src/FbTk/EventManager.hh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/FbTk/EventManager.hh b/src/FbTk/EventManager.hh index 79a25ce..fdcfe9c 100644 --- a/src/FbTk/EventManager.hh +++ b/src/FbTk/EventManager.hh | |||
| @@ -42,9 +42,8 @@ public: | |||
| 42 | void add(EventHandler &ev, Window win) { registerEventHandler(ev, win); } | 42 | void add(EventHandler &ev, Window win) { registerEventHandler(ev, win); } |
| 43 | void remove(Window win) { unregisterEventHandler(win); } | 43 | void remove(Window win) { unregisterEventHandler(win); } |
| 44 | 44 | ||
| 45 | bool grabKeyboard(EventHandler &ev, Window win); | 45 | bool grabKeyboard(Window win); |
| 46 | void ungrabKeyboard(); | 46 | void ungrabKeyboard(); |
| 47 | EventHandler *grabbingKeyboard() { return m_grabbing_keyboard; } | ||
| 48 | 47 | ||
| 49 | EventHandler *find(Window win); | 48 | EventHandler *find(Window win); |
| 50 | 49 | ||