diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-01-03 18:28:37 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-01-03 18:28:37 +0000 |
| commit | 8fe611b5cdc715900255ec328fb86264f64279f5 (patch) | |
| tree | 1fd07df87a847a942e7a50cec524d8ab14dcaf40 /src/Fl_x.cxx | |
| parent | 81be28e2dd5c7609ba9a07f20646b05bcb53e727 (diff) | |
Fix changing of schemes - otherwise Fl_Window::show() could cause a
reference to a non-existing tiled image.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1908 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_x.cxx')
| -rw-r--r-- | src/Fl_x.cxx | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx index dfe6b116d..f287eed8b 100644 --- a/src/Fl_x.cxx +++ b/src/Fl_x.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_x.cxx,v 1.24.2.24.2.9 2002/01/01 15:11:31 easysw Exp $" +// "$Id: Fl_x.cxx,v 1.24.2.24.2.10 2002/01/03 18:28:37 easysw Exp $" // // X specific code for the Fast Light Tool Kit (FLTK). // @@ -921,6 +921,13 @@ void Fl_Window::label(const char *name,const char *iname) { static inline int can_boxcheat(uchar b) {return (b==1 || (b&2) && b<=15);} void Fl_Window::show() { + image(Fl::scheme_bg_); + if (Fl::scheme_bg_) { + labeltype(FL_NORMAL_LABEL); + align(FL_ALIGN_CENTER | FL_ALIGN_INSIDE | FL_ALIGN_CLIP); + } else { + labeltype(FL_NO_LABEL); + } if (!shown()) { fl_open_display(); if (can_boxcheat(box())) fl_background_pixel = int(fl_xpixel(color())); @@ -947,5 +954,5 @@ void Fl_Window::make_current() { #endif // -// End of "$Id: Fl_x.cxx,v 1.24.2.24.2.9 2002/01/01 15:11:31 easysw Exp $". +// End of "$Id: Fl_x.cxx,v 1.24.2.24.2.10 2002/01/03 18:28:37 easysw Exp $". // |