From 2519e2614d262ecf7b0c0dd96a521174ee86eb08 Mon Sep 17 00:00:00 2001 From: markt <markt> Date: Sat, 31 Mar 2007 22:00:39 +0000 Subject: fixed some compiling issues --- src/RootTheme.cc | 2 -- src/Screen.cc | 2 +- src/Screen.hh | 7 +------ 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) { } void RootTheme::reconfigTheme() { - _FB_USES_NLS; - if (!m_background->loaded()) return; 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 { return 0; } -int BScreen::getHead(FbTk::FbWindow &win) const { +int BScreen::getHead(const FbTk::FbWindow &win) const { if (hasXinerama()) return getHead(win.x() + win.width()/2, win.y() + win.height()/2); 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: inline const std::string &getScrollAction() const { return *resource.scroll_action; } inline const bool getScrollReverse() const { return *resource.scroll_reverse; } - inline const bool clientMenuUsePixmap() const { return *resource.clientmenu_use_pixmap; } inline const bool getDefaultInternalTabs() const { return *resource.default_internal_tabs; } - inline const bool getTabsUsePixmap() const { return *resource.tabs_use_pixmap; } inline const bool getMaxOverTabs() const { return *resource.max_over_tabs; } inline unsigned int getTabWidth() const { return *resource.tab_width; } @@ -255,10 +253,9 @@ public: /** * Cycles focus of windows * @param opts focus options - * @param pat specific pattern to match windows with * @param reverse the order of cycling */ - void cycleFocus(int opts = 0, const ClientPattern *pat = 0, bool reverse = false); + void cycleFocus(int opts = 0, bool reverse = false); /** * Creates an empty menu with specified label @@ -582,8 +579,6 @@ private: FbTk::Resource<FbTk::GContext::CapStyle> gc_cap_style; FbTk::Resource<std::string> scroll_action; FbTk::Resource<bool> scroll_reverse; - FbTk::Resource<bool> clientmenu_use_pixmap; - FbTk::Resource<bool> tabs_use_pixmap; FbTk::Resource<bool> max_over_tabs; FbTk::Resource<bool> default_internal_tabs; -- cgit v0.11.2