From 61cf82771af9d39703ad0ebfdc9299fe5ffe525d Mon Sep 17 00:00:00 2001
From: markt <markt>
Date: Sat, 10 Mar 2007 18:06:09 +0000
Subject: removed some useless code

---
 src/RootTheme.cc | 10 ++--------
 src/RootTheme.hh |  3 +--
 src/Screen.cc    |  2 +-
 src/Window.hh    |  3 +--
 4 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/RootTheme.cc b/src/RootTheme.cc
index 1e54368..5c1e923 100644
--- a/src/RootTheme.cc
+++ b/src/RootTheme.cc
@@ -142,9 +142,8 @@ private:
 };
 
 
-RootTheme::RootTheme(FbTk::ImageControl &image_control, BScreen *scrn):
+RootTheme::RootTheme(FbTk::ImageControl &image_control):
     FbTk::Theme(image_control.screenNumber()),
-    m_screen(scrn),
     m_background(new BackgroundItem(*this, "background", "Background")),
     m_opgc(RootWindow(FbTk::App::instance()->display(), image_control.screenNumber())),
     m_image_ctrl(image_control) {
@@ -184,7 +183,7 @@ void RootTheme::reconfigTheme() {
         return;
     }
 
-    if (!m_background->changed() || !m_screen)
+    if (!m_background->changed())
         return;
 
     // style doesn't wish to change the background
@@ -195,9 +194,6 @@ void RootTheme::reconfigTheme() {
     // Else parse background from style 
     //
 
-    // root window helper
-    FbRootWindow &rootwin = m_screen->rootWindow();
-
     m_background->setApplied();
 
     // handle background option in style
@@ -264,6 +260,4 @@ void RootTheme::reconfigTheme() {
         exec.execute();
     }
 
-    rootwin.clear();
-
 }
diff --git a/src/RootTheme.hh b/src/RootTheme.hh
index 63be8b0..bcff938 100644
--- a/src/RootTheme.hh
+++ b/src/RootTheme.hh
@@ -46,7 +46,7 @@ public:
     /// constructor
     /// @param resmanager resource manager for finding specific resources
     /// @param image_control for rendering background texture
-    RootTheme(FbTk::ImageControl &image_control, BScreen *scrn = 0);
+    RootTheme(FbTk::ImageControl &image_control);
     ~RootTheme();
 
     bool fallback(FbTk::ThemeItem_base &item);
@@ -62,7 +62,6 @@ public:
     }
     
 private:
-    BScreen *m_screen;
     BackgroundItem *m_background;///< background image/texture
     FbTk::GContext m_opgc;
     FbTk::ImageControl &m_image_ctrl; ///< image control for rendering background texture
diff --git a/src/Screen.cc b/src/Screen.cc
index 9a3ef31..f399717 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -439,7 +439,7 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
         cmd.execute();
     }
 
-    m_root_theme.reset(new RootTheme(imageControl(), this));
+    m_root_theme.reset(new RootTheme(imageControl()));
     m_root_theme->reconfigTheme();
 
     m_windowtheme->setFocusedAlpha(*resource.focused_alpha);
diff --git a/src/Window.hh b/src/Window.hh
index 4923ca6..1e55fb5 100644
--- a/src/Window.hh
+++ b/src/Window.hh
@@ -198,8 +198,7 @@ public:
     // map this window
     void show();
     // unmap this window
-    void hide() { hide(true); }
-    void hide(bool interrupt_moving);
+    void hide(bool interrupt_moving = true);
     void iconify();
     void deiconify(bool reassoc = true, bool do_raise = true);
 
-- 
cgit v0.11.2