aboutsummaryrefslogtreecommitdiff
path: root/src/Xinerama.hh
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/Xinerama.hh
parent62bcfaf0e4fd7d77873343d880fc526ec58cdaa6 (diff)
downloadfluxbox_pavel-2940869cd7cc1688be5114451380275c9a85f5d1.zip
fluxbox_pavel-2940869cd7cc1688be5114451380275c9a85f5d1.tar.bz2
merge MenuTheme with FbTk::MenuTheme
Diffstat (limited to 'src/Xinerama.hh')
-rw-r--r--src/Xinerama.hh4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Xinerama.hh b/src/Xinerama.hh
index f57c584..24b4ca1 100644
--- a/src/Xinerama.hh
+++ b/src/Xinerama.hh
@@ -63,7 +63,7 @@ private:
63template <typename ItemType> 63template <typename ItemType>
64class XineramaHeadMenu : public FbMenu { 64class XineramaHeadMenu : public FbMenu {
65public: 65public:
66 XineramaHeadMenu(MenuTheme &tm, BScreen &screen, FbTk::ImageControl &imgctrl, 66 XineramaHeadMenu(FbTk::MenuTheme &tm, BScreen &screen, FbTk::ImageControl &imgctrl,
67 FbTk::XLayer &layer, ItemType &item, const FbTk::FbString & title = ""); 67 FbTk::XLayer &layer, ItemType &item, const FbTk::FbString & title = "");
68 68
69private: 69private:
@@ -72,7 +72,7 @@ private:
72 72
73 73
74template <typename ItemType> 74template <typename ItemType>
75XineramaHeadMenu<ItemType>::XineramaHeadMenu(MenuTheme &tm, BScreen &screen, FbTk::ImageControl &imgctrl, 75XineramaHeadMenu<ItemType>::XineramaHeadMenu(FbTk::MenuTheme &tm, BScreen &screen, FbTk::ImageControl &imgctrl,
76 FbTk::XLayer &layer, ItemType &item, const FbTk::FbString & title): 76 FbTk::XLayer &layer, ItemType &item, const FbTk::FbString & title):
77 FbMenu(tm, imgctrl, layer), 77 FbMenu(tm, imgctrl, layer),
78 m_object(item) 78 m_object(item)