toolbar themeing fixes

5 files changed, 28 insertions, 26 deletions

diff --git a/src/FbTk/MenuTheme.cc b/src/FbTk/MenuTheme.cc
index 605246a..95d15d1 100644
--- a/src/FbTk/MenuTheme.cc
+++ b/src/FbTk/MenuTheme.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: MenuTheme.cc,v 1.14 2004/01/08 22:07:58 fluxgen Exp $
+// $Id: MenuTheme.cc,v 1.15 2004/04/26 15:04:37 rathnor Exp $
 
 #include "MenuTheme.hh"
 
@@ -136,7 +136,7 @@ void ThemeItem<MenuTheme::BulletType>::setFromString(const char *str) {
 }
 
 template <>
-void ThemeItem<MenuTheme::BulletType>::load() {
+void ThemeItem<MenuTheme::BulletType>::load(const std::string *name, const std::string *altname) {
     // do nothing, we don't have anything extra to load
 }
 
@@ -151,7 +151,7 @@ void ThemeItem<unsigned int>::setFromString(const char *str) {
 }
 
 template <>
-void ThemeItem<unsigned int>::load() {
+void ThemeItem<unsigned int>::load(const std::string *name, const std::string *altname) {
 }
 
 
diff --git a/src/FbTk/Text.cc b/src/FbTk/Text.cc
index 190e233..8dc91d9 100644
--- a/src/FbTk/Text.cc
+++ b/src/FbTk/Text.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Text.cc,v 1.2 2003/08/11 14:59:57 fluxgen Exp $
+// $Id: Text.cc,v 1.3 2004/04/26 15:04:37 rathnor Exp $
 
 #include "Text.hh"
 
@@ -82,7 +82,7 @@ void ThemeItem<FbTk::Justify>::setFromString(const char *value) {
 
 // do nothing
 template <>
-void ThemeItem<FbTk::Justify>::load() {
+void ThemeItem<FbTk::Justify>::load(const std::string *name, const std::string *altname) {
 }
 
 }; // end namespace FbTk
diff --git a/src/FbTk/Theme.cc b/src/FbTk/Theme.cc
index 224ae6f..f9c3366 100644
--- a/src/FbTk/Theme.cc
+++ b/src/FbTk/Theme.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Theme.cc,v 1.25 2004/01/12 20:24:06 fluxgen Exp $
+// $Id: Theme.cc,v 1.26 2004/04/26 15:04:37 rathnor Exp $
 
 #include "Theme.hh"
 
@@ -157,11 +157,10 @@ bool ThemeManager::loadItem(ThemeItem_base &resource) {
 bool ThemeManager::loadItem(ThemeItem_base &resource, const std::string &name, const std::string &alt_name) {
     XrmValue value;
     char *value_type;
-
     if (XrmGetResource(*m_database, name.c_str(),
                        alt_name.c_str(), &value_type, &value)) {
         resource.setFromString(value.addr);
-        resource.load(); // load additional stuff by the ThemeItem
+        resource.load(&name, &alt_name); // load additional stuff by the ThemeItem
     } else
         return false;
 
@@ -171,11 +170,10 @@ bool ThemeManager::loadItem(ThemeItem_base &resource, const std::string &name, c
 std::string ThemeManager::resourceValue(const std::string &name, const std::string &altname) {
     XrmValue value;
     char *value_type;
-        
     if (*m_database != 0 && XrmGetResource(*m_database, name.c_str(),
-                                           altname.c_str(), &value_type, &value) && value.addr != 0) {
+                                           altname.c_str(), &value_type, &value) && value.addr != 0)
         return string(value.addr);
-    }
+
     return "";
 }
 
diff --git a/src/FbTk/Theme.hh b/src/FbTk/Theme.hh
index 105d860..ff84051 100644
--- a/src/FbTk/Theme.hh
+++ b/src/FbTk/Theme.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Theme.hh,v 1.15 2004/01/02 22:55:15 fluxgen Exp $
+// $Id: Theme.hh,v 1.16 2004/04/26 15:04:37 rathnor Exp $
 
 /**
  @file holds ThemeItem<T>, Theme and ThemeManager which is the base for any theme
@@ -50,7 +50,7 @@ public:
     virtual ~ThemeItem_base() { }
     virtual void setFromString(const char *str) = 0;
     virtual void setDefaultValue() = 0;
-    virtual void load() = 0; // if it needs to load additional stuff
+    virtual void load(const std::string *name = 0, const std::string *altname = 0) = 0; // if it needs to load additional stuff
     const std::string &name() const { return m_name; }
     const std::string &altName() const { return m_altname; }
 private:
@@ -70,7 +70,9 @@ public:
     /// specialized
     void setFromString(const char *strval);
     /// specialized
-    void load();
+    // name and altname may be different to the primary ones (e.g. from fallback)
+    // if they are null, then the original name is used
+    void load(const std::string *name = 0, const std::string *altname = 0);
     /**
        @name access operators
     */
diff --git a/src/FbTk/ThemeItems.hh b/src/FbTk/ThemeItems.hh
index 63c17df..57a5f11 100644
--- a/src/FbTk/ThemeItems.hh
+++ b/src/FbTk/ThemeItems.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: ThemeItems.hh,v 1.5 2004/02/10 19:03:04 fluxgen Exp $
+// $Id: ThemeItems.hh,v 1.6 2004/04/26 15:04:37 rathnor Exp $
 
 /// @file implements common theme items
 
@@ -42,7 +42,7 @@ using namespace std;
 
 // create default handlers for Color, Font, Texture, int and string
 template <>
-void FbTk::ThemeItem<std::string>::load() { }
+void FbTk::ThemeItem<std::string>::load(const std::string *name, const std::string *altname) { }
 
 template <>
 void FbTk::ThemeItem<std::string>::setDefaultValue() { 
@@ -55,7 +55,7 @@ void FbTk::ThemeItem<std::string>::setFromString(const char *str) {
 }
 
 template <>
-void FbTk::ThemeItem<int>::load() { }
+void FbTk::ThemeItem<int>::load(const std::string *name, const std::string *altname) { }
 
 template <>
 void FbTk::ThemeItem<int>::setDefaultValue() {
@@ -103,18 +103,21 @@ void ThemeItem<FbTk::Font>::setFromString(const char *str) {
 
 // do nothing
 template <>
-void ThemeItem<FbTk::Font>::load() {
+void ThemeItem<FbTk::Font>::load(const std::string *name, const std::string *altname) {
 }
 
 
 template <>
-void ThemeItem<FbTk::Texture>::load() {
+void ThemeItem<FbTk::Texture>::load(const std::string *o_name, const std::string *o_altname) {
+    const std::string &m_name = (o_name==0)?name():*o_name;
+    const std::string &m_altname = (o_altname==0)?altName():*o_altname;
+
     string color_name(ThemeManager::instance().
-                      resourceValue(name()+".color", altName()+".Color"));
+                      resourceValue(m_name+".color", m_altname+".Color"));
     string colorto_name(ThemeManager::instance().
-                        resourceValue(name()+".colorTo", altName()+".ColorTo"));
+                        resourceValue(m_name+".colorTo", m_altname+".ColorTo"));
     string pixmap_name(ThemeManager::instance().
-                       resourceValue(name()+".pixmap", altName()+".Pixmap"));
+                       resourceValue(m_name+".pixmap", m_altname+".Pixmap"));
 
 
     // set default value if we failed to load color
@@ -137,7 +140,7 @@ void ThemeItem<FbTk::Texture>::load() {
                                                              m_tm.screenNum()));
     if (pm.get() == 0) {
         if (FbTk::ThemeManager::instance().verbose()) {
-            cerr<<"Resource("<<name()+".pixmap"
+            cerr<<"Resource("<<m_name+".pixmap"
                 <<"): Failed to load image: "<<pixmap_name<<endl;
         }
         m_value.pixmap() = 0;
@@ -163,8 +166,7 @@ void ThemeItem<FbTk::Texture>::setFromString(const char *str) {
 
 // not used
 template <>
-void FbTk::ThemeItem<PixmapWithMask>::
-load() { }
+void FbTk::ThemeItem<PixmapWithMask>::load(const std::string *name, const std::string *altname) { }
 
 template <>
 void FbTk::ThemeItem<PixmapWithMask>::
@@ -211,7 +213,7 @@ void ThemeItem<FbTk::Color>::setFromString(const char *str) {
 
 // does nothing
 template <>
-void ThemeItem<FbTk::Color>::load() { }
+void ThemeItem<FbTk::Color>::load(const std::string *name, const std::string *altname) { }
 
 } // end namespace FbTk