mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix scheme background image bug on X11.

Browse Source 
Drop changelog for hidden mouse pointer problems since that change was
not made until after 1.1.7 was released (CHANGES only shows changes/fixes
to the previous release...)


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5657 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet 2007-02-02 19:37:30 +00:00
parent 2368590ecd
commit a4814c41c3
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -2,7 +2,8 @@ CHANGES IN FLTK 1.1.8
- Documentation fixes (STR #1454, STR #1455, STR #1456, - Documentation fixes (STR #1454, STR #1455, STR #1456,
STR #1457, STR #1458, STR #1460, STR #1481, STR #1578) STR #1457, STR #1458, STR #1460, STR #1481, STR #1578)
- Avoiding hidden mouse pointer in OS X (STR #1475) - Fl_Double_Window did not always show the scheme
background image.
- Fixed first window behavior in OS X (STR #1548) - Fixed first window behavior in OS X (STR #1548)
- Fixed calculation of character widths for OS X - Fixed calculation of character widths for OS X
Quartz rendering (no STR) Quartz rendering (no STR)

9
src/Fl_Double_Window.cxx
View File

@ -3,7 +3,7 @@
// //
// Double-buffered window code for the Fast Light Tool Kit (FLTK). // 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 // This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Library General Public // modify it under the terms of the GNU Library General Public
@ -61,13 +61,6 @@ static int can_xdbe() {
#endif #endif
void Fl_Double_Window::show() { 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(); Fl_Window::show();
} }

7
src/Fl_x.cxx
View File

@ -3,7 +3,7 @@
// //
// X specific code for the Fast Light Tool Kit (FLTK). // 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 // This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Library General Public // modify it under the terms of the GNU Library General Public
@ -1374,7 +1374,10 @@ void Fl_Window::show() {
Fl_Tooltip::exit(this); Fl_Tooltip::exit(this);
if (!shown()) { if (!shown()) {
fl_open_display(); 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); Fl_X::make_xid(this);
} else { } else {
XMapRaised(fl_display, i->xid); XMapRaised(fl_display, i->xid);