diff options
| author | Manolo Gouy <Manolo> | 2014-09-21 14:10:36 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2014-09-21 14:10:36 +0000 |
| commit | f1b2c92fcea255c692177689f178a2eb74613f4e (patch) | |
| tree | 5575726e6e330b2d32b38d5bb26bb80e805357fe /src/Fl_x.cxx | |
| parent | 67817899484ce2299550c09791aa2a794bbf01f0 (diff) | |
STR#3093 continued: deleted the Fl_Shaped_Window class. Instead, added new member function Fl_Window::shape(Fl_Image*)
that gives a non-rectangular shape to a standard window. The benefit is that it works with Fl_Double_Window and Fl_Menu_Window as well.
It also works for free with Fl_Gl_Window on the X11 platform only.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10325 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_x.cxx')
| -rw-r--r-- | src/Fl_x.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx index 653938d6b..b1406a4b9 100644 --- a/src/Fl_x.cxx +++ b/src/Fl_x.cxx @@ -35,7 +35,6 @@ # include <FL/fl_draw.H> # include <FL/Fl_Paged_Device.H> # include <FL/Fl_Shared_Image.H> -# include <FL/Fl_Shaped_Window.H> # include <FL/fl_ask.H> # include <FL/filename.H> # include <stdio.h> @@ -2549,8 +2548,8 @@ void Fl_X::make_xid(Fl_Window* win, XVisualInfo *visual, Colormap colormap) } #endif - if (win->type() == FL_SHAPED_WINDOW) { - ((Fl_Shaped_Window*)win)->combine_mask(); + if (win->shape_data_) { + win->combine_mask(); } XMapWindow(fl_display, xp->xid); if (showit) { |