diff options
Diffstat (limited to 'src/Theme.cc')
-rw-r--r-- | src/Theme.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Theme.cc b/src/Theme.cc index dd6b759..6fb0909 100644 --- a/src/Theme.cc +++ b/src/Theme.cc | |||
@@ -1,5 +1,5 @@ | |||
1 | // Theme.cc for fluxbox | 1 | // Theme.cc for fluxbox |
2 | // Copyright (c) 2001 Henrik Kinnunen (fluxgen@linuxmail.org) | 2 | // Copyright (c) 2001-2002 Henrik Kinnunen (fluxgen@linuxmail.org) |
3 | // | 3 | // |
4 | // Permission is hereby granted, free of charge, to any person obtaining a | 4 | // Permission is hereby granted, free of charge, to any person obtaining a |
5 | // copy of this software and associated documentation files (the "Software"), | 5 | // copy of this software and associated documentation files (the "Software"), |
@@ -41,7 +41,7 @@ | |||
41 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 41 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
42 | // DEALINGS IN THE SOFTWARE. | 42 | // DEALINGS IN THE SOFTWARE. |
43 | 43 | ||
44 | // $Id: Theme.cc,v 1.11 2002/01/08 21:37:39 fluxgen Exp $ | 44 | // $Id: Theme.cc,v 1.12 2002/01/09 00:08:19 fluxgen Exp $ |
45 | 45 | ||
46 | #ifndef _GNU_SOURCE | 46 | #ifndef _GNU_SOURCE |
47 | #define _GNU_SOURCE | 47 | #define _GNU_SOURCE |
@@ -76,9 +76,9 @@ m_imagecontrol(ic), | |||
76 | m_display(display), | 76 | m_display(display), |
77 | m_colormap(colormap), | 77 | m_colormap(colormap), |
78 | m_screennum(screennum), | 78 | m_screennum(screennum), |
79 | m_rootcommand(rootcommand ? "" : rootcommand) //we dont want to send 0-pointer to std::string | 79 | m_rootcommand(rootcommand==0 ? "" : rootcommand) //we dont want to send 0-pointer to std::string |
80 | { | 80 | { |
81 | 81 | ||
82 | //default settings | 82 | //default settings |
83 | m_menustyle.titlefont.set = m_menustyle.framefont.set = m_toolbarstyle.font.set = | 83 | m_menustyle.titlefont.set = m_menustyle.framefont.set = m_toolbarstyle.font.set = |
84 | m_windowstyle.font.set = m_windowstyle.tab.font.set = 0; | 84 | m_windowstyle.font.set = m_windowstyle.tab.font.set = 0; |