Add support of Fl_Region to the Cairo graphics driver

and remove it from the Wayland graphics driver.

3 files changed, 9 insertions, 2 deletions

diff --git a/FL/platform_types.h b/FL/platform_types.h
index cb85214fb..8b0527183 100644
--- a/FL/platform_types.h
+++ b/FL/platform_types.h
@@ -115,7 +115,7 @@ typedef struct HGLRC__ *GLContext;
 
 #elif defined(FLTK_USE_WAYLAND)
 typedef struct fl_wld_buffer *Fl_Offscreen; /**< an offscreen drawing buffer */
-typedef struct flWaylandRegion* Fl_Region;
+typedef struct flCairoRegion* Fl_Region;
 typedef int FL_SOCKET; /**< socket or file descriptor */
 typedef void *EGLContext;
 typedef EGLContext GLContext;
diff --git a/FL/wayland.H b/FL/wayland.H
index 598228c75..9918e1f7b 100755
--- a/FL/wayland.H
+++ b/FL/wayland.H
@@ -20,7 +20,7 @@
 
 typedef struct wld_window *Window;
 
-struct flWaylandRegion {
+struct flCairoRegion {
   int count;
   struct _cairo_rectangle *rects;
 }; // a region is the union of a series of rectangles
diff --git a/FL/x11.H b/FL/x11.H
index 6dcb972e5..116870166 100644
--- a/FL/x11.H
+++ b/FL/x11.H
@@ -86,6 +86,13 @@ extern FL_EXPORT Fl_XFont_On_Demand fl_xfont;
 
 extern FL_EXPORT char fl_override_redirect; // hack into Fl_X::make_xid()
 
+#if USE_PANGO
+struct flCairoRegion {
+  int count;
+  struct _cairo_rectangle *rects;
+}; // a region is the union of a series of rectangles
+#endif
+
 #endif // FL_LIBRARY || FL_INTERNALS
 
 #endif // FL_DOXYGEN