diff options
author | fluxgen <fluxgen> | 2002-11-15 14:24:59 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2002-11-15 14:24:59 (GMT) |
commit | e4ae8cf3eb110941eec0c4fc0f5d2f2bf8f959c9 (patch) | |
tree | e6a94c9319b6de1e048bb0cef0489370b0ccc055 | |
parent | ffcc409ad9b7364cfff46e4257d0a6eba98b07bf (diff) | |
download | fluxbox-e4ae8cf3eb110941eec0c4fc0f5d2f2bf8f959c9.zip fluxbox-e4ae8cf3eb110941eec0c4fc0f5d2f2bf8f959c9.tar.bz2 |
minor stuff
-rw-r--r-- | src/Basemenu.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/Basemenu.cc b/src/Basemenu.cc index c44658c..75c88a9 100644 --- a/src/Basemenu.cc +++ b/src/Basemenu.cc | |||
@@ -22,7 +22,7 @@ | |||
22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
24 | 24 | ||
25 | // $Id: Basemenu.cc,v 1.34 2002/11/12 22:15:06 fluxgen Exp $ | 25 | // $Id: Basemenu.cc,v 1.35 2002/11/15 14:24:59 fluxgen Exp $ |
26 | 26 | ||
27 | //use GNU extensions | 27 | //use GNU extensions |
28 | #ifndef _GNU_SOURCE | 28 | #ifndef _GNU_SOURCE |
@@ -386,7 +386,7 @@ void Basemenu::update() { | |||
386 | } | 386 | } |
387 | 387 | ||
388 | 388 | ||
389 | void Basemenu::show(void) { | 389 | void Basemenu::show() { |
390 | XMapSubwindows(m_display, menu.window); | 390 | XMapSubwindows(m_display, menu.window); |
391 | XMapWindow(m_display, menu.window); | 391 | XMapWindow(m_display, menu.window); |
392 | visible = True; | 392 | visible = True; |
@@ -397,10 +397,11 @@ void Basemenu::show(void) { | |||
397 | 397 | ||
398 | shown = this; | 398 | shown = this; |
399 | } | 399 | } |
400 | |||
400 | } | 401 | } |
401 | 402 | ||
402 | 403 | ||
403 | void Basemenu::hide(void) { | 404 | void Basemenu::hide() { |
404 | if ((! torn) && hide_tree && m_parent && m_parent->isVisible()) { | 405 | if ((! torn) && hide_tree && m_parent && m_parent->isVisible()) { |
405 | Basemenu *p = m_parent; | 406 | Basemenu *p = m_parent; |
406 | 407 | ||
@@ -412,7 +413,7 @@ void Basemenu::hide(void) { | |||
412 | } | 413 | } |
413 | 414 | ||
414 | 415 | ||
415 | void Basemenu::internal_hide(void) { | 416 | void Basemenu::internal_hide() { |
416 | if (which_sub >= 0) { | 417 | if (which_sub >= 0) { |
417 | BasemenuItem *tmp = menuitems[which_sub]; | 418 | BasemenuItem *tmp = menuitems[which_sub]; |
418 | tmp->submenu()->internal_hide(); | 419 | tmp->submenu()->internal_hide(); |
@@ -840,7 +841,7 @@ void Basemenu::buttonReleaseEvent(XButtonEvent *re) { | |||
840 | if (which_sub >= 0) | 841 | if (which_sub >= 0) |
841 | drawSubmenu(which_sub); | 842 | drawSubmenu(which_sub); |
842 | } | 843 | } |
843 | 844 | ||
844 | if (re->x >= 0 && re->x <= (signed) menu.width && | 845 | if (re->x >= 0 && re->x <= (signed) menu.width && |
845 | re->y >= 0 && re->y <= (signed) menu.title_h) | 846 | re->y >= 0 && re->y <= (signed) menu.title_h) |
846 | if (re->button == 3) | 847 | if (re->button == 3) |