cleaning

1 files changed, 5 insertions, 29 deletions

diff --git a/src/ToolbarTheme.cc b/src/ToolbarTheme.cc
index 0608726..6067264 100644
--- a/src/ToolbarTheme.cc
+++ b/src/ToolbarTheme.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: ToolbarTheme.cc,v 1.7 2003/08/13 09:53:46 fluxgen Exp $
+// $Id: ToolbarTheme.cc,v 1.8 2003/08/13 15:12:39 fluxgen Exp $
 
 #include "ToolbarTheme.hh"
 
@@ -45,36 +45,20 @@ void FbTk::ThemeItem<bool>::setFromString(char const *strval) {
 
 ToolbarTheme::ToolbarTheme(int screen_num):
     FbTk::Theme(screen_num),
-    m_button_color(*this, 
-                   "toolbar.button.picColor", "Toolbar.Button.PicColor"),
-    m_border_color(*this,
-                   "toolbar.borderColor", "Toolbar.BorderColor"),
     m_toolbar(*this, "toolbar", "Toolbar"),
-    m_button(*this, "toolbar.button", "Toolbar.Button"),
-    m_pressed_button(*this, 
-                     "toolbar.button.pressed", "Toolbar.Button.Pressed"),
-    m_border_width(*this, "toolbar.borderWidth", "Toolbar.BorderWidth"),
+    m_border(*this, "toolbar", "Toolbar"),
     m_bevel_width(*this, "toolbar.bevelWidth", "Toolbar.BevelWidth"),
-    m_button_border_width(*this, "toolbar.button.borderWidth", "Toolbar.Button.BorderWidth"),
     m_shape(*this, "toolbar.shaped", "Toolbar.Shaped"),    
     m_alpha(*this, "toolbar.alpha", "Toolbar.Alpha"),
     m_display(FbTk::App::instance()->display()) {
 
-    Window rootwindow = RootWindow(m_display, screen_num);
-
-    XGCValues gcv;
-    unsigned long gc_value_mask = GCForeground;
-    
-
-    gcv.foreground = m_button_color->pixel();
-    m_button_pic_gc =
-        XCreateGC(m_display, rootwindow,
-                  gc_value_mask, &gcv);
+    *m_bevel_width = 0;
+    *m_alpha = 255;
 
 }
 
 ToolbarTheme::~ToolbarTheme() {
-    XFreeGC(m_display, m_button_pic_gc);
+
 }
 
 void ToolbarTheme::reconfigTheme() {
@@ -82,12 +66,4 @@ void ToolbarTheme::reconfigTheme() {
         *m_alpha = 255;
     else if (*m_alpha < 0)
         *m_alpha = 0;
-
-    XGCValues gcv;
-    unsigned long gc_value_mask = GCForeground;
-
-    gcv.foreground = m_button_color->pixel();
-    XChangeGC(m_display, m_button_pic_gc,
-              gc_value_mask, &gcv);
-
 }