aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.cc
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-01-09 14:11:20 (GMT)
committerfluxgen <fluxgen>2002-01-09 14:11:20 (GMT)
commite0969658986378d0d79b990a9862e5c0e3aff911 (patch)
tree2d50f61d27b3e7e7d0a99bcdb938797486ad3fdb /src/Screen.cc
parenta7e1cc466ae291852dd1f0c296417250483b137c (diff)
downloadfluxbox-e0969658986378d0d79b990a9862e5c0e3aff911.zip
fluxbox-e0969658986378d0d79b990a9862e5c0e3aff911.tar.bz2
updated copyright date and added id-tags
Diffstat (limited to 'src/Screen.cc')
-rw-r--r--src/Screen.cc12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index 944821d..9f67c3b 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -1,4 +1,6 @@
1// $id$ 1// Screen.cc for Fluxbox Window Manager
2// Copyright (c) 2001 - 2002 Henrik Kinnunen (fluxgen@linuxmail.org)
3//
2// Screen.cc for Blackbox - an X11 Window manager 4// Screen.cc for Blackbox - an X11 Window manager
3// Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net) 5// Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
4// 6//
@@ -20,6 +22,8 @@
20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
21// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
22 24
25// $id$
26
23// stupid macros needed to access some functions in version 2 of the GNU C 27// stupid macros needed to access some functions in version 2 of the GNU C
24// library 28// library
25#ifndef _GNU_SOURCE 29#ifndef _GNU_SOURCE
@@ -189,7 +193,7 @@ BScreen::BScreen(Fluxbox *b, int scrn) : ScreenInfo(b, scrn) {
189 image_control->setDither(resource.image_dither); 193 image_control->setDither(resource.image_dither);
190 theme = new Theme(getBaseDisplay()->getXDisplay(), getRootWindow(), getColormap(), getScreenNumber(), 194 theme = new Theme(getBaseDisplay()->getXDisplay(), getRootWindow(), getColormap(), getScreenNumber(),
191 image_control, fluxbox->getStyleFilename(), fluxbox->getRootCommand()); 195 image_control, fluxbox->getStyleFilename(), fluxbox->getRootCommand());
192 196
193#ifdef GNOME 197#ifdef GNOME
194 /* create the GNOME window */ 198 /* create the GNOME window */
195 Window gnome_win = XCreateSimpleWindow(getBaseDisplay()->getXDisplay(), 199 Window gnome_win = XCreateSimpleWindow(getBaseDisplay()->getXDisplay(),
@@ -425,7 +429,6 @@ BScreen::~BScreen(void) {
425 delete iconList; 429 delete iconList;
426 delete netizenList; 430 delete netizenList;
427 delete theme; 431 delete theme;
428 theme = 0;
429 432
430} 433}
431 434
@@ -433,7 +436,8 @@ void BScreen::reconfigure(void) {
433 if (Fluxbox::instance()->getRootCommand()) 436 if (Fluxbox::instance()->getRootCommand())
434 theme->setRootCommand(Fluxbox::instance()->getRootCommand()); 437 theme->setRootCommand(Fluxbox::instance()->getRootCommand());
435 else 438 else
436 theme->setRootCommand(""); 439 theme->setRootCommand("");
440
437 theme->load(fluxbox->getStyleFilename()); 441 theme->load(fluxbox->getStyleFilename());
438 theme->reconfigure(); 442 theme->reconfigure();
439 I18n *i18n = I18n::instance(); 443 I18n *i18n = I18n::instance();