diff options
author | Jim Ramsay <i.am@jimramsay.com> | 2009-10-14 01:05:49 (GMT) |
---|---|---|
committer | Jim Ramsay <i.am@jimramsay.com> | 2009-10-14 01:05:49 (GMT) |
commit | 839ea523164caecd8c779e60539b78c2a748a81f (patch) | |
tree | 0019d04f27a1a258bc7a900e3cf77b916dca6493 /src/FbTk/Resource.hh | |
parent | 4d3aa646c1d1d1de4fdb31f938f6ea62fd5dd21e (diff) | |
parent | 8def80cec337a986b762cdbb5e2555c6da809353 (diff) | |
download | fluxbox_lack-839ea523164caecd8c779e60539b78c2a748a81f.zip fluxbox_lack-839ea523164caecd8c779e60539b78c2a748a81f.tar.bz2 |
Merge branch 'master' into argbtesting/argbargb
Conflicts:
src/FbTk/FbWindow.cc
Diffstat (limited to 'src/FbTk/Resource.hh')
-rw-r--r-- | src/FbTk/Resource.hh | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/FbTk/Resource.hh b/src/FbTk/Resource.hh index bfdcdca..8c9d645 100644 --- a/src/FbTk/Resource.hh +++ b/src/FbTk/Resource.hh | |||
@@ -139,12 +139,10 @@ public: | |||
139 | } | 139 | } |
140 | } | 140 | } |
141 | protected: | 141 | protected: |
142 | static void ensureXrmIsInitialize(); | ||
143 | 142 | ||
144 | int m_db_lock; | 143 | int m_db_lock; |
145 | 144 | ||
146 | private: | 145 | private: |
147 | static bool m_init; | ||
148 | 146 | ||
149 | ResourceList m_resourcelist; | 147 | ResourceList m_resourcelist; |
150 | 148 | ||
@@ -168,11 +166,8 @@ template <typename T> | |||
168 | class Resource:public Resource_base, public Accessor<T> { | 166 | class Resource:public Resource_base, public Accessor<T> { |
169 | public: | 167 | public: |
170 | typedef T Type; | 168 | typedef T Type; |
171 | Resource(ResourceManager &rm, T val, | 169 | Resource(ResourceManager &rm, T val, const std::string &name, const std::string &altname): |
172 | const std::string &name, const std::string &altname): | 170 | Resource_base(name, altname), m_value(val), m_defaultval(val), m_rm(rm) { |
173 | Resource_base(name, altname), | ||
174 | m_value(val), m_defaultval(val), | ||
175 | m_rm(rm) { | ||
176 | m_rm.addResource(*this); // add this to resource handler | 171 | m_rm.addResource(*this); // add this to resource handler |
177 | } | 172 | } |
178 | virtual ~Resource() { | 173 | virtual ~Resource() { |