New OPTION_WAYLAND_ONLY for CMake to build pure Wayland platform.

3 files changed, 7 insertions, 9 deletions

diff --git a/FL/platform.H b/FL/platform.H
index 834a32392..75ec2f841 100644
--- a/FL/platform.H
+++ b/FL/platform.H
@@ -39,6 +39,9 @@ class Fl_Window;
 #    include "mac.H"
 #  elif defined(FLTK_USE_WAYLAND)
 #    include "wayland.H"
+#     if !FLTK_USE_X11
+        typedef struct wld_window *Window;
+#     endif
 #  elif defined(FLTK_USE_X11)
 #    include "x11.H"
 #  endif // _WIN32
@@ -58,7 +61,7 @@ public:
   // static variables, static functions and member functions
   static Fl_X* first;
   static Fl_X* i(const Fl_Window* w) {return (Fl_X*)w->i;}
-#  if defined(FLTK_USE_X11) // for backward compatibility
+#  if defined(FLTK_USE_X11) && FLTK_USE_X11 // for backward compatibility
   static void make_xid(Fl_Window*, XVisualInfo* =fl_visual, Colormap=fl_colormap);
   static Fl_X* set_xid(Fl_Window*, Window);
 #  endif
diff --git a/FL/wayland.H b/FL/wayland.H
index 2f88ce2e9..3c16dc22a 100644
--- a/FL/wayland.H
+++ b/FL/wayland.H
@@ -42,7 +42,9 @@ extern FL_EXPORT EGLContext fl_wl_glcontext(GLContext rc);
 
 #ifndef FL_DOXYGEN
 
+#  if FLTK_USE_X11
 //  *********** for X11 component ***********
-#  include "x11.H"
+#    include "x11.H"
+#  endif
 
 #endif // FL_DOXYGEN
diff --git a/FL/x11.H b/FL/x11.H
index 56ca43b08..a86b605f2 100644
--- a/FL/x11.H
+++ b/FL/x11.H
@@ -108,13 +108,6 @@ 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