diff options
author | fluxgen <fluxgen> | 2003-08-29 00:48:41 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2003-08-29 00:48:41 (GMT) |
commit | 8f0b2b2016d0023f928bab973936cf049fe9a30a (patch) | |
tree | 4f9f930159ef6630c6c0ee7579fbe8043abdfec1 /src/IconbarTheme.cc | |
parent | 76c1bd4b62ed62ffae1f3f6da8dde9716440d87c (diff) | |
download | fluxbox-8f0b2b2016d0023f928bab973936cf049fe9a30a.zip fluxbox-8f0b2b2016d0023f928bab973936cf049fe9a30a.tar.bz2 |
minor fixes
Diffstat (limited to 'src/IconbarTheme.cc')
-rw-r--r-- | src/IconbarTheme.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/IconbarTheme.cc b/src/IconbarTheme.cc index 1c84a78..3c73376 100644 --- a/src/IconbarTheme.cc +++ b/src/IconbarTheme.cc | |||
@@ -20,7 +20,7 @@ | |||
20 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 20 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
21 | // DEALINGS IN THE SOFTWARE. | 21 | // DEALINGS IN THE SOFTWARE. |
22 | 22 | ||
23 | // $Id: IconbarTheme.cc,v 1.6 2003/08/28 23:51:26 fluxgen Exp $ | 23 | // $Id: IconbarTheme.cc,v 1.7 2003/08/29 00:48:41 fluxgen Exp $ |
24 | 24 | ||
25 | #include "IconbarTheme.hh" | 25 | #include "IconbarTheme.hh" |
26 | #include "FbTk/App.hh" | 26 | #include "FbTk/App.hh" |
@@ -69,6 +69,7 @@ bool IconbarTheme::fallback(FbTk::ThemeItem_base &item) { | |||
69 | tmp_item.load(); | 69 | tmp_item.load(); |
70 | // copy texture | 70 | // copy texture |
71 | *m_focused_texture = *tmp_item; | 71 | *m_focused_texture = *tmp_item; |
72 | return true; | ||
72 | } else if (&m_unfocused_texture == &item) { | 73 | } else if (&m_unfocused_texture == &item) { |
73 | // special case for textures since they're using .load() | 74 | // special case for textures since they're using .load() |
74 | FbTk::ThemeItem<FbTk::Texture> tmp_item(m_unfocused_texture.theme(), | 75 | FbTk::ThemeItem<FbTk::Texture> tmp_item(m_unfocused_texture.theme(), |
@@ -76,7 +77,7 @@ bool IconbarTheme::fallback(FbTk::ThemeItem_base &item) { | |||
76 | tmp_item.load(); | 77 | tmp_item.load(); |
77 | // copy texture | 78 | // copy texture |
78 | *m_unfocused_texture = *tmp_item; | 79 | *m_unfocused_texture = *tmp_item; |
79 | 80 | return true; | |
80 | } else if (&m_empty_texture == &item) { | 81 | } else if (&m_empty_texture == &item) { |
81 | return (tm.loadItem(item, m_focused_texture.name(), m_focused_texture.altName()) ? | 82 | return (tm.loadItem(item, m_focused_texture.name(), m_focused_texture.altName()) ? |
82 | true : | 83 | true : |