From f1b2c92fcea255c692177689f178a2eb74613f4e Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Sun, 21 Sep 2014 14:10:36 +0000
Subject: 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
---
 src/Fl_x.cxx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/Fl_x.cxx')

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) {
-- 
cgit v1.2.3