aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.cc
diff options
context:
space:
mode:
authorPavel Labath <pavelo@centrum.sk>2011-07-12 12:16:32 (GMT)
committerPaul Tagliamonte <paultag@fluxbox.org>2012-04-07 02:11:31 (GMT)
commit137d2edaa8cb5f4f41e2ef85de3b4316b32daf79 (patch)
treef3d8eafb1931745eea005b901f8c9a491a637365 /src/Screen.cc
parent56b0a9c4c7677c8d03341bc52694c45845700ea0 (diff)
downloadfluxbox_paul-137d2edaa8cb5f4f41e2ef85de3b4316b32daf79.zip
fluxbox_paul-137d2edaa8cb5f4f41e2ef85de3b4316b32daf79.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 112e120..4c05fe3 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"),