summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManolo Gouy <Manolo>2016-09-11 07:12:11 +0000
committerManolo Gouy <Manolo>2016-09-11 07:12:11 +0000
commit35a5148ee833deb1bee85ad853ce70c81b30b62e (patch)
tree0bacd65060c84d879dd91271f416a25594f847f4
parentc5960df5fb4d99098c4ecbc28cc2f90c7f02e9aa (diff)
Put the code that defines the layout of struct _XRegion in FL/x.H
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11930 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
-rw-r--r--FL/x.H14
-rw-r--r--src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx14
2 files changed, 14 insertions, 14 deletions
diff --git a/FL/x.H b/FL/x.H
index 7083164f8..c73eaaa46 100644
--- a/FL/x.H
+++ b/FL/x.H
@@ -107,6 +107,20 @@ extern FL_EXPORT Fl_XFont_On_Demand fl_xfont;
extern FL_EXPORT char fl_override_redirect; // hack into Fl_X::make_xid()
extern FL_EXPORT int fl_background_pixel; // hack into Fl_X::make_xid()
+#if HAVE_X11_XREGION_H
+# include <X11/Xregion.h>
+#else // if the X11/Xregion.h header is not available, we assume this is the layout of an X11 Region:
+typedef struct {
+ short x1, x2, y1, y2;
+} BOX;
+struct _XRegion {
+ long size;
+ long numRects;
+ BOX *rects;
+ BOX extents;
+};
+#endif // HAVE_X11_XREGION_H
+
#endif // FL_LIBRARY || FL_INTERNALS
# endif // X11
diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx
index 445c255c8..25ac80298 100644
--- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx
+++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx
@@ -54,20 +54,6 @@
# include "../../Fl_XColor.H"
# include "../../flstring.h"
-#if HAVE_X11_XREGION_H
-# include <X11/Xregion.h>
-#else // if the X11/Xregion.h header is not available, we assume this is the layout of an X11 Region:
-typedef struct {
- short x1, x2, y1, y2;
-} BOX;
-struct _XRegion {
- long size;
- long numRects;
- BOX *rects;
- BOX extents;
-};
-#endif // HAVE_X11_XREGION_H
-
static XImage xi; // template used to pass info to X
static int bytes_per_pixel;
static int scanline_add;