summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkt <markt>2007-03-31 22:00:39 (GMT)
committermarkt <markt>2007-03-31 22:00:39 (GMT)
commit2519e2614d262ecf7b0c0dd96a521174ee86eb08 (patch)
treef32465a94abbf7710d28df1abd3932521c853419
parent9b84090f4ad3dea4c07a4e174fa4b46a2386de82 (diff)
downloadfluxbox_lack-2519e2614d262ecf7b0c0dd96a521174ee86eb08.zip
fluxbox_lack-2519e2614d262ecf7b0c0dd96a521174ee86eb08.tar.bz2
fixed some compiling issues
-rw-r--r--src/RootTheme.cc2
-rw-r--r--src/Screen.cc2
-rw-r--r--src/Screen.hh7
3 files changed, 2 insertions, 9 deletions
diff --git a/src/RootTheme.cc b/src/RootTheme.cc
index b05e322..4e5c9fe 100644
--- a/src/RootTheme.cc
+++ b/src/RootTheme.cc
@@ -172,8 +172,6 @@ bool RootTheme::fallback(FbTk::ThemeItem_base &item) {
172} 172}
173 173
174void RootTheme::reconfigTheme() { 174void RootTheme::reconfigTheme() {
175 _FB_USES_NLS;
176
177 if (!m_background->loaded()) 175 if (!m_background->loaded())
178 return; 176 return;
179 177
diff --git a/src/Screen.cc b/src/Screen.cc
index 3ef27a6..7af00a7 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -2234,7 +2234,7 @@ int BScreen::getHead(int x, int y) const {
2234 return 0; 2234 return 0;
2235} 2235}
2236 2236
2237int BScreen::getHead(FbTk::FbWindow &win) const { 2237int BScreen::getHead(const FbTk::FbWindow &win) const {
2238 if (hasXinerama()) 2238 if (hasXinerama())
2239 return getHead(win.x() + win.width()/2, win.y() + win.height()/2); 2239 return getHead(win.x() + win.width()/2, win.y() + win.height()/2);
2240 else 2240 else
diff --git a/src/Screen.hh b/src/Screen.hh
index ab6ce7d..7409abd 100644
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -149,9 +149,7 @@ public:
149 149
150 inline const std::string &getScrollAction() const { return *resource.scroll_action; } 150 inline const std::string &getScrollAction() const { return *resource.scroll_action; }
151 inline const bool getScrollReverse() const { return *resource.scroll_reverse; } 151 inline const bool getScrollReverse() const { return *resource.scroll_reverse; }
152 inline const bool clientMenuUsePixmap() const { return *resource.clientmenu_use_pixmap; }
153 inline const bool getDefaultInternalTabs() const { return *resource.default_internal_tabs; } 152 inline const bool getDefaultInternalTabs() const { return *resource.default_internal_tabs; }
154 inline const bool getTabsUsePixmap() const { return *resource.tabs_use_pixmap; }
155 inline const bool getMaxOverTabs() const { return *resource.max_over_tabs; } 153 inline const bool getMaxOverTabs() const { return *resource.max_over_tabs; }
156 154
157 inline unsigned int getTabWidth() const { return *resource.tab_width; } 155 inline unsigned int getTabWidth() const { return *resource.tab_width; }
@@ -255,10 +253,9 @@ public:
255 /** 253 /**
256 * Cycles focus of windows 254 * Cycles focus of windows
257 * @param opts focus options 255 * @param opts focus options
258 * @param pat specific pattern to match windows with
259 * @param reverse the order of cycling 256 * @param reverse the order of cycling
260 */ 257 */
261 void cycleFocus(int opts = 0, const ClientPattern *pat = 0, bool reverse = false); 258 void cycleFocus(int opts = 0, bool reverse = false);
262 259
263 /** 260 /**
264 * Creates an empty menu with specified label 261 * Creates an empty menu with specified label
@@ -582,8 +579,6 @@ private:
582 FbTk::Resource<FbTk::GContext::CapStyle> gc_cap_style; 579 FbTk::Resource<FbTk::GContext::CapStyle> gc_cap_style;
583 FbTk::Resource<std::string> scroll_action; 580 FbTk::Resource<std::string> scroll_action;
584 FbTk::Resource<bool> scroll_reverse; 581 FbTk::Resource<bool> scroll_reverse;
585 FbTk::Resource<bool> clientmenu_use_pixmap;
586 FbTk::Resource<bool> tabs_use_pixmap;
587 FbTk::Resource<bool> max_over_tabs; 582 FbTk::Resource<bool> max_over_tabs;
588 FbTk::Resource<bool> default_internal_tabs; 583 FbTk::Resource<bool> default_internal_tabs;
589 584