aboutsummaryrefslogtreecommitdiff
path: root/src/fluxbox.hh
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2001-12-17 00:46:15 (GMT)
committerfluxgen <fluxgen>2001-12-17 00:46:15 (GMT)
commitb6ae55efd12beacf9261f0c84549c9625f243560 (patch)
tree26c79b86817a5c4c0296c5b3d016075333802184 /src/fluxbox.hh
parent98eb553afa016c54b6aeff157bc2240c02603e94 (diff)
downloadfluxbox_pavel-b6ae55efd12beacf9261f0c84549c9625f243560.zip
fluxbox_pavel-b6ae55efd12beacf9261f0c84549c9625f243560.tar.bz2
Merge with pekdon
Diffstat (limited to 'src/fluxbox.hh')
-rw-r--r--src/fluxbox.hh6
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:
94 static Fluxbox *instance(int m_argc=0, char **m_argv=0, char *dpy_name=0, char *rc=0); 94 static Fluxbox *instance(int m_argc=0, char **m_argv=0, char *dpy_name=0, char *rc=0);
95 95
96 inline bool useTabs() const { return resource.tabs; } 96 inline bool useTabs() const { return resource.tabs; }
97// inline TabType &getTabType() { return resource.tabtype; }
98 inline bool useIconBar() const { return resource.iconbar; } 97 inline bool useIconBar() const { return resource.iconbar; }
99 inline void saveTabs(bool value) { resource.tabs = value; } 98 inline void saveTabs(bool value) { resource.tabs = value; }
100 inline void saveIconBar(bool value) { resource.iconbar = value; } 99 inline void saveIconBar(bool value) { resource.iconbar = value; }
@@ -144,9 +143,6 @@ public:
144 { return resource.cache_life; } 143 { return resource.cache_life; }
145 inline const unsigned long &getCacheMax(void) const 144 inline const unsigned long &getCacheMax(void) const
146 { return resource.cache_max; } 145 { return resource.cache_max; }
147 inline const unsigned int &getTabWidth(void) const { return resource.tabwidth; }
148 inline const unsigned int &getTabHeight(void) const { return resource.tabheight; }
149
150 146
151 inline void maskWindowEvents(Window w, FluxboxWindow *bw) 147 inline void maskWindowEvents(Window w, FluxboxWindow *bw)
152 { masked = w; masked_window = bw; } 148 { masked = w; masked_window = bw; }
@@ -220,8 +216,6 @@ private:
220 timeval auto_raise_delay; 216 timeval auto_raise_delay;
221 unsigned long cache_life, cache_max; 217 unsigned long cache_life, cache_max;
222 bool tabs, iconbar; 218 bool tabs, iconbar;
223 //TabType tabtype;
224 unsigned int tabwidth, tabheight;
225 } resource; 219 } resource;
226 220
227 struct titlebar_t { 221 struct titlebar_t {