From d4768073fa67e7f78872bc80f4dff1dd8aa32f69 Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Thu, 10 Mar 2016 17:19:34 +0000
Subject: Implement non-rectangular windows using the Window Driver mechanism.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11336 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/Fl_x.cxx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/Fl_x.cxx')

diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx
index 26cec974b..cd3a70f6c 100644
--- a/src/Fl_x.cxx
+++ b/src/Fl_x.cxx
@@ -53,6 +53,7 @@ class Fl_Widget *fl_selection_requestor;
 #  include <stdlib.h>
 #  include "flstring.h"
 #  include "drivers/X11/Fl_X11_Screen_Driver.H"
+#  include "drivers/X11/Fl_X11_Window_Driver.H"
 #  include <unistd.h>
 #  include <time.h>
 #  include <sys/time.h>
@@ -2557,8 +2558,8 @@ void Fl_X::make_xid(Fl_Window* win, XVisualInfo *visual, Colormap colormap)
   }
 #endif
 
-  if (win->shape_data_) {
-    win->combine_mask();
+  if (win->is_shaped()) {
+    ((Fl_X11_Window_Driver*)win->pWindowDriver)->combine_mask();
     }
   XMapWindow(fl_display, xp->xid);
   if (showit) {
-- 
cgit v1.2.3