From 7fab9c0a0b97721f893a8c12e7cb4df40f1aa4ef Mon Sep 17 00:00:00 2001
From: fluxgen <fluxgen>
Date: Wed, 10 Dec 2003 21:40:22 +0000
Subject: fixed bug in loading label.active

---
 src/FbWinFrameTheme.cc | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/FbWinFrameTheme.cc b/src/FbWinFrameTheme.cc
index 70312bf..3461865 100644
--- a/src/FbWinFrameTheme.cc
+++ b/src/FbWinFrameTheme.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: FbWinFrameTheme.cc,v 1.14 2003/12/09 08:48:08 rathnor Exp $
+// $Id: FbWinFrameTheme.cc,v 1.15 2003/12/10 21:40:22 fluxgen Exp $
 
 #include "FbWinFrameTheme.hh"
 #include "App.hh"
@@ -101,8 +101,15 @@ bool FbWinFrameTheme::fallback(FbTk::ThemeItem_base &item) {
         return FbTk::ThemeManager::instance().loadItem(item, "bevelWidth", "bevelWidth");
     else if (item.name() == "window.handleWidth")
         return FbTk::ThemeManager::instance().loadItem(item, "handleWidth", "HandleWidth");
-    else if (item.name() == "window.label.active")
-        return FbTk::ThemeManager::instance().loadItem(item, "window.label.unfocus", "Window.Label.Unfocus");
+    else if (item.name() == "window.label.active") {
+        // special case for textures since they're using .load()
+        FbTk::ThemeItem<FbTk::Texture> tmp_item(m_label_active.theme(),
+                                                "window.label.unfocus", "Window.Label.Unfocus");
+        tmp_item.load();
+        // copy texture
+        *m_label_active = *tmp_item;
+        return true;
+    }
     else if (item.name() == "window.label.active.textColor")
         return FbTk::ThemeManager::instance().loadItem(item, "window.label.unfocus.textColor", "Window.Label.Unfocus.TextColor");
     
-- 
cgit v0.11.2