diff options
author | fluxgen <fluxgen> | 2002-01-08 21:37:39 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2002-01-08 21:37:39 (GMT) |
commit | 522e38bd716a6537d6efe086ecf4ff43d51c0fea (patch) | |
tree | 059b6514e5f03620d75f7b99321c8de11061a816 /src/Theme.cc | |
parent | cb612c391bf7807f898fa84291827594448f78ab (diff) | |
download | fluxbox_pavel-522e38bd716a6537d6efe086ecf4ff43d51c0fea.zip fluxbox_pavel-522e38bd716a6537d6efe086ecf4ff43d51c0fea.tar.bz2 |
Fixed rootcommand
Diffstat (limited to 'src/Theme.cc')
-rw-r--r-- | src/Theme.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Theme.cc b/src/Theme.cc index afd6a33..dd6b759 100644 --- a/src/Theme.cc +++ b/src/Theme.cc | |||
@@ -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.10 2002/01/08 12:13:55 fluxgen Exp $ | 44 | // $Id: Theme.cc,v 1.11 2002/01/08 21:37:39 fluxgen Exp $ |
45 | 45 | ||
46 | #ifndef _GNU_SOURCE | 46 | #ifndef _GNU_SOURCE |
47 | #define _GNU_SOURCE | 47 | #define _GNU_SOURCE |
@@ -75,9 +75,10 @@ Theme::Theme(Display *display, Window rootwindow, Colormap colormap, | |||
75 | m_imagecontrol(ic), | 75 | 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 | { | 80 | { |
80 | m_rootcommand = (rootcommand == 0 ? "" : rootcommand); | 81 | |
81 | //default settings | 82 | //default settings |
82 | 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 = |
83 | m_windowstyle.font.set = m_windowstyle.tab.font.set = 0; | 84 | m_windowstyle.font.set = m_windowstyle.tab.font.set = 0; |