aboutsummaryrefslogtreecommitdiff
path: root/src/FbMenu.cc
diff options
context:
space:
mode:
authorMark Tiefenbruck <mark@fluxbox.org>2007-12-28 07:16:17 (GMT)
committerMark Tiefenbruck <mark@fluxbox.org>2007-12-28 07:16:17 (GMT)
commit2940869cd7cc1688be5114451380275c9a85f5d1 (patch)
tree8200e95524356dfd45cb9ceaef0b4ea4b0816fa9 /src/FbMenu.cc
parent62bcfaf0e4fd7d77873343d880fc526ec58cdaa6 (diff)
downloadfluxbox-2940869cd7cc1688be5114451380275c9a85f5d1.zip
fluxbox-2940869cd7cc1688be5114451380275c9a85f5d1.tar.bz2
merge MenuTheme with FbTk::MenuTheme
Diffstat (limited to 'src/FbMenu.cc')
-rw-r--r--src/FbMenu.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/FbMenu.cc b/src/FbMenu.cc
index 8065294..65fbecd 100644
--- a/src/FbMenu.cc
+++ b/src/FbMenu.cc
@@ -25,12 +25,12 @@
25#include "FbMenu.hh" 25#include "FbMenu.hh"
26 26
27#include "fluxbox.hh" 27#include "fluxbox.hh"
28#include "MenuTheme.hh" 28#include "FbTk/MenuTheme.hh"
29#include "Screen.hh" 29#include "Screen.hh"
30 30
31#include "FbTk/Shape.hh" 31#include "FbTk/Shape.hh"
32 32
33FbMenu::FbMenu(MenuTheme &tm, FbTk::ImageControl &imgctrl, 33FbMenu::FbMenu(FbTk::MenuTheme &tm, FbTk::ImageControl &imgctrl,
34 FbTk::XLayer &layer): 34 FbTk::XLayer &layer):
35 FbTk::Menu(tm, imgctrl), 35 FbTk::Menu(tm, imgctrl),
36 m_layeritem(fbwindow(), layer), 36 m_layeritem(fbwindow(), layer),
@@ -53,7 +53,7 @@ void FbMenu::clearWindow() {
53} 53}
54 54
55void FbMenu::reconfigure() { 55void FbMenu::reconfigure() {
56 m_shape->setPlaces(dynamic_cast<const MenuTheme&>(theme()).shapePlaces()); 56 m_shape->setPlaces(theme().shapePlaces());
57 FbTk::Menu::reconfigure(); 57 FbTk::Menu::reconfigure();
58} 58}
59 59