diff options
author | mathias <mathias> | 2005-11-16 06:42:50 (GMT) |
---|---|---|
committer | mathias <mathias> | 2005-11-16 06:42:50 (GMT) |
commit | 28bf04cc13b9de0991f1fd97d98faa3df36ae300 (patch) | |
tree | 4a48110bd5a5a04d8c808d37d71fb3c888ee052c | |
parent | 497ac82dc502b8c9659f2d84664a724ac21e8191 (diff) | |
download | fluxbox-28bf04cc13b9de0991f1fd97d98faa3df36ae300.zip fluxbox-28bf04cc13b9de0991f1fd97d98faa3df36ae300.tar.bz2 |
resolved minor for compiling under win32/cygwin, multiple symbols
-rw-r--r-- | src/ScreenResources.cc | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/src/ScreenResources.cc b/src/ScreenResources.cc index 03514ad..d541ae7 100644 --- a/src/ScreenResources.cc +++ b/src/ScreenResources.cc | |||
@@ -41,7 +41,6 @@ void FbTk::Resource<BScreen::PlacementPolicy>::setFromString(const char *str) { | |||
41 | *(*this) = BScreen::CASCADEPLACEMENT; | 41 | *(*this) = BScreen::CASCADEPLACEMENT; |
42 | else | 42 | else |
43 | setDefaultValue(); | 43 | setDefaultValue(); |
44 | |||
45 | } | 44 | } |
46 | 45 | ||
47 | template <> | 46 | template <> |
@@ -129,8 +128,7 @@ void FbTk::Resource<FbTk::MenuTheme::MenuMode>::setFromString(const char *str) { | |||
129 | } | 128 | } |
130 | 129 | ||
131 | template<> | 130 | template<> |
132 | std::string FbTk::Resource<BScreen::ResizeModel>:: | 131 | std::string FbTk::Resource<BScreen::ResizeModel>::getString() { |
133 | getString() { | ||
134 | switch (m_value) { | 132 | switch (m_value) { |
135 | case BScreen::QUADRANTRESIZE: | 133 | case BScreen::QUADRANTRESIZE: |
136 | return std::string("Quadrant"); | 134 | return std::string("Quadrant"); |
@@ -153,8 +151,7 @@ setFromString(char const *strval) { | |||
153 | } | 151 | } |
154 | 152 | ||
155 | template<> | 153 | template<> |
156 | std::string FbTk::Resource<BScreen::FocusModel>:: | 154 | std::string FbTk::Resource<BScreen::FocusModel>::getString() { |
157 | getString() { | ||
158 | switch (m_value) { | 155 | switch (m_value) { |
159 | case BScreen::MOUSEFOCUS: | 156 | case BScreen::MOUSEFOCUS: |
160 | return string("MouseFocus"); | 157 | return string("MouseFocus"); |
@@ -177,8 +174,7 @@ setFromString(char const *strval) { | |||
177 | } | 174 | } |
178 | 175 | ||
179 | template<> | 176 | template<> |
180 | std::string FbTk::Resource<BScreen::TabFocusModel>:: | 177 | std::string FbTk::Resource<BScreen::TabFocusModel>::getString() { |
181 | getString() { | ||
182 | switch (m_value) { | 178 | switch (m_value) { |
183 | case BScreen::MOUSETABFOCUS: | 179 | case BScreen::MOUSETABFOCUS: |
184 | return string("SloppyTabFocus"); | 180 | return string("SloppyTabFocus"); |
@@ -201,8 +197,7 @@ setFromString(char const *strval) { | |||
201 | } | 197 | } |
202 | 198 | ||
203 | template<> | 199 | template<> |
204 | std::string FbTk::Resource<BScreen::FollowModel>:: | 200 | std::string FbTk::Resource<BScreen::FollowModel>::getString() { |
205 | getString() { | ||
206 | switch (m_value) { | 201 | switch (m_value) { |
207 | case BScreen::FOLLOW_ACTIVE_WINDOW: | 202 | case BScreen::FOLLOW_ACTIVE_WINDOW: |
208 | return std::string("Follow"); | 203 | return std::string("Follow"); |
@@ -229,11 +224,6 @@ setFromString(char const *strval) { | |||
229 | } | 224 | } |
230 | 225 | ||
231 | template<> | 226 | template<> |
232 | void FbTk::Resource<FbTk::GContext::LineStyle>::setDefaultValue() { | ||
233 | *(*this) = FbTk::GContext::LINESOLID; | ||
234 | } | ||
235 | |||
236 | template<> | ||
237 | std::string FbTk::Resource<FbTk::GContext::LineStyle>::getString() { | 227 | std::string FbTk::Resource<FbTk::GContext::LineStyle>::getString() { |
238 | switch(m_value) { | 228 | switch(m_value) { |
239 | case FbTk::GContext::LINESOLID: | 229 | case FbTk::GContext::LINESOLID: |
@@ -264,11 +254,6 @@ void FbTk::Resource<FbTk::GContext::LineStyle> | |||
264 | } | 254 | } |
265 | 255 | ||
266 | template<> | 256 | template<> |
267 | void FbTk::Resource<FbTk::GContext::JoinStyle>::setDefaultValue() { | ||
268 | *(*this) = FbTk::GContext::JOINMITER; | ||
269 | } | ||
270 | |||
271 | template<> | ||
272 | std::string FbTk::Resource<FbTk::GContext::JoinStyle>::getString() { | 257 | std::string FbTk::Resource<FbTk::GContext::JoinStyle>::getString() { |
273 | switch(m_value) { | 258 | switch(m_value) { |
274 | case FbTk::GContext::JOINMITER: | 259 | case FbTk::GContext::JOINMITER: |