mirror of https://github.com/fltk/fltk
Remove code requiring config.h from public header FL/x.H
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11937 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
parent
b43a5cf1fe
commit
c34255f8b9
14
FL/x.H
14
FL/x.H
|
@ -107,20 +107,6 @@ 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
|
||||
|
|
|
@ -25,9 +25,24 @@
|
|||
#ifndef FL_CFG_GFX_XLIB_H
|
||||
#define FL_CFG_GFX_XLIB_H
|
||||
|
||||
#include <config.h>
|
||||
#include <FL/Fl_Graphics_Driver.H>
|
||||
#include <FL/x.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
|
||||
|
||||
/**
|
||||
\brief The Xlib-specific graphics class.
|
||||
*
|
||||
|
|
Loading…
Reference in New Issue