summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Fl_Double_Window.cxx9
-rw-r--r--src/Fl_x.cxx7
2 files changed, 6 insertions, 10 deletions
diff --git a/src/Fl_Double_Window.cxx b/src/Fl_Double_Window.cxx
index 427c43807..29a3b2599 100644
--- a/src/Fl_Double_Window.cxx
+++ b/src/Fl_Double_Window.cxx
@@ -3,7 +3,7 @@
//
// Double-buffered window code for the Fast Light Tool Kit (FLTK).
//
-// Copyright 1998-2005 by Bill Spitzak and others.
+// Copyright 1998-2007 by Bill Spitzak and others.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Library General Public
@@ -61,13 +61,6 @@ static int can_xdbe() {
#endif
void Fl_Double_Window::show() {
-#if !defined(WIN32) && !defined(__APPLE__)
- if (!shown()) { // don't set the background pixel
- fl_open_display();
- Fl_X::make_xid(this);
- return;
- }
-#endif
Fl_Window::show();
}
diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx
index e37d1ab7b..696cda10c 100644
--- a/src/Fl_x.cxx
+++ b/src/Fl_x.cxx
@@ -3,7 +3,7 @@
//
// X specific code for the Fast Light Tool Kit (FLTK).
//
-// Copyright 1998-2006 by Bill Spitzak and others.
+// Copyright 1998-2007 by Bill Spitzak and others.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Library General Public
@@ -1374,7 +1374,10 @@ void Fl_Window::show() {
Fl_Tooltip::exit(this);
if (!shown()) {
fl_open_display();
- if (can_boxcheat(box())) fl_background_pixel = int(fl_xpixel(color()));
+ // Don't set background pixel for double-buffered windows...
+ if (type() == FL_WINDOW && can_boxcheat(box())) {
+ fl_background_pixel = int(fl_xpixel(color()));
+ }
Fl_X::make_xid(this);
} else {
XMapRaised(fl_display, i->xid);