diff options
author | akir <akir> | 2004-10-21 10:29:49 (GMT) |
---|---|---|
committer | akir <akir> | 2004-10-21 10:29:49 (GMT) |
commit | 0d7f757c2c14fcab9932b2749c734ccfd433f735 (patch) | |
tree | 2bafd1748d0a05de44c8cb729767ca6e487d8dd4 /src/FbTk | |
parent | d51d01cc49d7d725ae32b169f81376fa5b9e702e (diff) | |
download | fluxbox_paul-0d7f757c2c14fcab9932b2749c734ccfd433f735.zip fluxbox_paul-0d7f757c2c14fcab9932b2749c734ccfd433f735.tar.bz2 |
fixes missing header to avoid missing declarations (mipspro)
Diffstat (limited to 'src/FbTk')
-rw-r--r-- | src/FbTk/ThemeItems.hh | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/FbTk/ThemeItems.hh b/src/FbTk/ThemeItems.hh index 259ccc7..60efe2f 100644 --- a/src/FbTk/ThemeItems.hh +++ b/src/FbTk/ThemeItems.hh | |||
@@ -19,7 +19,7 @@ | |||
19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
20 | // DEALINGS IN THE SOFTWARE. | 20 | // DEALINGS IN THE SOFTWARE. |
21 | 21 | ||
22 | // $Id: ThemeItems.hh,v 1.8 2004/08/31 15:26:39 rathnor Exp $ | 22 | // $Id: ThemeItems.hh,v 1.9 2004/10/21 10:29:49 akir Exp $ |
23 | 23 | ||
24 | /// @file implements common theme items | 24 | /// @file implements common theme items |
25 | 25 | ||
@@ -32,6 +32,7 @@ | |||
32 | #include "Font.hh" | 32 | #include "Font.hh" |
33 | #include "PixmapWithMask.hh" | 33 | #include "PixmapWithMask.hh" |
34 | #include "Image.hh" | 34 | #include "Image.hh" |
35 | #include "StringUtil.hh" | ||
35 | 36 | ||
36 | #include <string> | 37 | #include <string> |
37 | #ifdef HAVE_CSTDIO | 38 | #ifdef HAVE_CSTDIO |
@@ -49,19 +50,19 @@ template <> | |||
49 | void FbTk::ThemeItem<std::string>::load(const std::string *name, const std::string *altname) { } | 50 | void FbTk::ThemeItem<std::string>::load(const std::string *name, const std::string *altname) { } |
50 | 51 | ||
51 | template <> | 52 | template <> |
52 | void FbTk::ThemeItem<std::string>::setDefaultValue() { | 53 | void FbTk::ThemeItem<std::string>::setDefaultValue() { |
53 | *(*this) = ""; | 54 | *(*this) = ""; |
54 | } | 55 | } |
55 | 56 | ||
56 | template <> | 57 | template <> |
57 | void FbTk::ThemeItem<std::string>::setFromString(const char *str) { | 58 | void FbTk::ThemeItem<std::string>::setFromString(const char *str) { |
58 | *(*this) = (str ? str : ""); | 59 | *(*this) = (str ? str : ""); |
59 | } | 60 | } |
60 | 61 | ||
61 | template <> | 62 | template <> |
62 | void FbTk::ThemeItem<int>::load(const std::string *name, const std::string *altname) { } | 63 | void FbTk::ThemeItem<int>::load(const std::string *name, const std::string *altname) { } |
63 | 64 | ||
64 | template <> | 65 | template<> |
65 | void FbTk::ThemeItem<int>::setDefaultValue() { | 66 | void FbTk::ThemeItem<int>::setDefaultValue() { |
66 | *(*this) = 0; | 67 | *(*this) = 0; |
67 | } | 68 | } |
@@ -102,7 +103,7 @@ void ThemeItem<FbTk::Font>::setFromString(const char *str) { | |||
102 | } | 103 | } |
103 | setDefaultValue(); | 104 | setDefaultValue(); |
104 | } | 105 | } |
105 | 106 | ||
106 | } | 107 | } |
107 | 108 | ||
108 | // do nothing | 109 | // do nothing |
@@ -197,14 +198,15 @@ setFromString(const char *str) { | |||
197 | 198 | ||
198 | std::auto_ptr<FbTk::PixmapWithMask> pm(Image::load(filename, m_tm.screenNum())); | 199 | std::auto_ptr<FbTk::PixmapWithMask> pm(Image::load(filename, m_tm.screenNum())); |
199 | if (pm.get() == 0) | 200 | if (pm.get() == 0) |
200 | setDefaultValue(); | 201 | setDefaultValue(); |
201 | else { | 202 | else { |
202 | (*this)->pixmap() = pm->pixmap().release(); | 203 | (*this)->pixmap() = pm->pixmap().release(); |
203 | (*this)->mask() = pm->mask().release(); | 204 | (*this)->mask() = pm->mask().release(); |
204 | } | 205 | } |
205 | } | 206 | } |
206 | } | 207 | } |
207 | 208 | ||
209 | |||
208 | template <> | 210 | template <> |
209 | void ThemeItem<FbTk::Color>::setDefaultValue() { | 211 | void ThemeItem<FbTk::Color>::setDefaultValue() { |
210 | m_value.setFromString("white", m_tm.screenNum()); | 212 | m_value.setFromString("white", m_tm.screenNum()); |