aboutsummaryrefslogtreecommitdiff
path: root/src/Window.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/Window.cc
parent24cdaecc1f32b29b29602c7b03d7a6202e3d87c2 (diff)
downloadfluxbox_paul-592d306e702cac55245b8485db9a769f47584137.zip
fluxbox_paul-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/Window.cc')
-rw-r--r--src/Window.cc9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/Window.cc b/src/Window.cc
index 18b1d7a..b1da798 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -251,11 +251,8 @@ private:
251 int m_mode; 251 int m_mode;
252}; 252};
253 253
254extern const char win_buttons_delim[] = " \t\n"; 254typedef FbTk::VectorTraits<FbTk::EnumTraits<WinButton::Type> > WinButtonsTraits;
255typedef FbTk::Resource< 255typedef FbTk::Resource<vector<WinButton::Type>, WinButtonsTraits> WinButtonsResource;
256 vector<WinButton::Type>,
257 FbTk::VectorTraits<FbTk::EnumTraits<WinButton::Type>, win_buttons_delim>
258> WinButtonsResource;
259 256
260} 257}
261 258
@@ -3477,7 +3474,7 @@ void FluxboxWindow::setupWindow() {
3477 titlebar_side[i] = 3474 titlebar_side[i] =
3478 new WinButtonsResource(rm, 3475 new WinButtonsResource(rm,
3479 WinButtonsResource::Type(begin, end), 3476 WinButtonsResource::Type(begin, end),
3480 titlebar_name[i]); 3477 titlebar_name[i], WinButtonsTraits(" \t\n"));
3481 3478
3482 3479
3483 screen().addManagedResource(titlebar_side[i]); 3480 screen().addManagedResource(titlebar_side[i]);