Merge with pekdon

1 files changed, 0 insertions, 6 deletions

diff --git a/src/fluxbox.hh b/src/fluxbox.hh
index 95be304..4f74789 100644
--- a/src/fluxbox.hh
+++ b/src/fluxbox.hh
@@ -94,7 +94,6 @@ public:
         static Fluxbox *instance(int m_argc=0, char **m_argv=0, char *dpy_name=0, char *rc=0);
         
         inline bool useTabs() const { return resource.tabs; }
-//      inline TabType &getTabType() { return resource.tabtype; }
         inline bool useIconBar() const { return resource.iconbar; }
         inline void saveTabs(bool value) { resource.tabs = value; }
         inline void saveIconBar(bool value) { resource.iconbar = value; }
@@ -144,9 +143,6 @@ public:
                 { return resource.cache_life; }
         inline const unsigned long &getCacheMax(void) const
                 { return resource.cache_max; }
-        inline const unsigned int &getTabWidth(void) const { return resource.tabwidth; }
-        inline const unsigned int &getTabHeight(void) const { return resource.tabheight; }
-
 
         inline void maskWindowEvents(Window w, FluxboxWindow *bw)
                 { masked = w; masked_window = bw; }
@@ -220,8 +216,6 @@ private:
                 timeval auto_raise_delay;
                 unsigned long cache_life, cache_max;
                 bool tabs, iconbar;
-                //TabType tabtype;
-                unsigned int tabwidth, tabheight;
         } resource;
         
         struct titlebar_t {