aboutsummaryrefslogtreecommitdiff
path: root/src/FbMenu.cc
diff options
context:
space:
mode:
authorMark Tiefenbruck <mark@fluxbox.org>2008-08-30 22:36:53 (GMT)
committerMark Tiefenbruck <mark@fluxbox.org>2008-08-30 22:36:53 (GMT)
commit41b2e0ced41580d377ea04a3c1c19408f2d8db13 (patch)
tree276612e9d808863bed0210fa59ce8af24425148d /src/FbMenu.cc
parentfd0389d2e1c28e7dcd1507f76ed37eb8366c4af0 (diff)
downloadfluxbox_pavel-41b2e0ced41580d377ea04a3c1c19408f2d8db13.zip
fluxbox_pavel-41b2e0ced41580d377ea04a3c1c19408f2d8db13.tar.bz2
use FbMenu::window instead of WindowCmd<>::window for displaying items in the window menu
Diffstat (limited to 'src/FbMenu.cc')
-rw-r--r--src/FbMenu.cc13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/FbMenu.cc b/src/FbMenu.cc
index 769241d..5bc3622 100644
--- a/src/FbMenu.cc
+++ b/src/FbMenu.cc
@@ -35,14 +35,11 @@ FbMenu::FbMenu(FbTk::ThemeProxy<FbTk::MenuTheme> &tm,
35 35
36} 36}
37 37
38void FbMenu::show() {
39 WindowCmd<void>::setWindow(s_window);
40 FbTk::Menu::show();
41}
42
43void FbMenu::buttonPressEvent(XButtonEvent &be) { 38void FbMenu::buttonPressEvent(XButtonEvent &be) {
39 WinClient *old = WindowCmd<void>::client();
44 WindowCmd<void>::setWindow(s_window); 40 WindowCmd<void>::setWindow(s_window);
45 FbTk::Menu::buttonPressEvent(be); 41 FbTk::Menu::buttonPressEvent(be);
42 WindowCmd<void>::setClient(old);
46} 43}
47 44
48void FbMenu::buttonReleaseEvent(XButtonEvent &be) { 45void FbMenu::buttonReleaseEvent(XButtonEvent &be) {
@@ -55,13 +52,17 @@ void FbMenu::buttonReleaseEvent(XButtonEvent &be) {
55 screen->getHeadWidth(head), 52 screen->getHeadWidth(head),
56 screen->getHeadHeight(head)); 53 screen->getHeadHeight(head));
57 } 54 }
58 WindowCmd<void>::setWindow(s_window);
59 55
60 // now get on with the show 56 // now get on with the show
57 WinClient *old = WindowCmd<void>::client();
58 WindowCmd<void>::setWindow(s_window);
61 FbTk::Menu::buttonReleaseEvent(be); 59 FbTk::Menu::buttonReleaseEvent(be);
60 WindowCmd<void>::setClient(old);
62} 61}
63 62
64void FbMenu::keyPressEvent(XKeyEvent &ke) { 63void FbMenu::keyPressEvent(XKeyEvent &ke) {
64 WinClient *old = WindowCmd<void>::client();
65 WindowCmd<void>::setWindow(s_window); 65 WindowCmd<void>::setWindow(s_window);
66 FbTk::Menu::keyPressEvent(ke); 66 FbTk::Menu::keyPressEvent(ke);
67 WindowCmd<void>::setClient(old);
67} 68}