aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.cc
diff options
context:
space:
mode:
authorPavel Labath <pavelo@centrum.sk>2011-07-12 12:16:32 (GMT)
committerPavel Labath <pavelo@centrum.sk>2011-11-01 09:57:22 (GMT)
commit592d306e702cac55245b8485db9a769f47584137 (patch)
tree866a2e17bbebfc0be17b4b829da124cd26e24776 /src/Screen.cc
parent24cdaecc1f32b29b29602c7b03d7a6202e3d87c2 (diff)
downloadfluxbox_pavel-592d306e702cac55245b8485db9a769f47584137.zip
fluxbox_pavel-592d306e702cac55245b8485db9a769f47584137.tar.bz2
Enable the resource traits classes to hold non-static members
ps: the Resource class inherits from the Traits class instead of holding it as a member because it's more size-efficient (base classes can have zero size, members cannot).
Diffstat (limited to 'src/Screen.cc')
-rw-r--r--src/Screen.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index 376c3f5..36a4233 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -242,11 +242,10 @@ const EnumTraits<FbWinFrame::TabPlacement>::Pair EnumTraits<FbWinFrame::TabPlace
242} // end namespace FbTk 242} // end namespace FbTk
243 243
244 244
245const char BScreen::ScreenResource::workspace_names_delim[] = ",";
246
247BScreen::ScreenResource::ScreenResource(FbTk::ResourceManager_base &rm, 245BScreen::ScreenResource::ScreenResource(FbTk::ResourceManager_base &rm,
248 const string &scrname): 246 const string &scrname):
249 workspace_names(rm, std::vector<std::string>(), scrname + ".workspaceNames"), 247 workspace_names(rm, std::vector<std::string>(), scrname + ".workspaceNames",
248 FbTk::VectorTraits<FbTk::StringTraits>(",") ),
250 opaque_move(rm, true, scrname + ".opaqueMove"), 249 opaque_move(rm, true, scrname + ".opaqueMove"),
251 full_max(rm, false, scrname+".fullMaximization"), 250 full_max(rm, false, scrname+".fullMaximization"),
252 max_ignore_inc(rm, true, scrname+".maxIgnoreIncrement"), 251 max_ignore_inc(rm, true, scrname+".maxIgnoreIncrement"),