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-07-12 12:16:32 (GMT)
commitd03f47e861140e93e7edea61e6276bc22b406559 (patch)
treebfd12e07377810c8d05ca4a7d6cc12451dadd816 /src/Screen.cc
parent881aa0d8fbda2b3198a8e47a317794663af3c2e1 (diff)
downloadfluxbox_pavel-d03f47e861140e93e7edea61e6276bc22b406559.zip
fluxbox_pavel-d03f47e861140e93e7edea61e6276bc22b406559.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 cb86c73..e4eca07 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"),