summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManolo Gouy <Manolo>2016-03-01 18:07:12 +0000
committerManolo Gouy <Manolo>2016-03-01 18:07:12 +0000
commita3d54d5d6cdd4a3cce8398675514c8e06c9ea13a (patch)
tree6afdec21a65506e94f019790ee77b80ad19e2e7b
parent7decb3d3b226854175b99ff0173ed7136e9f2176 (diff)
Correct the headers included by FL/Fl_Copy_Surface.H, following the new implementation of this class.
This change requires other changes in header inclusions by class Fl_Image_Surface. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11258 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
-rw-r--r--FL/Fl_Copy_Surface.H4
-rw-r--r--FL/Fl_Image_Surface.H3
-rw-r--r--src/Fl_Image_Surface.cxx1
-rw-r--r--src/drivers/Xlib/Fl_Xlib_Copy_Surface.cxx1
4 files changed, 5 insertions, 4 deletions
diff --git a/FL/Fl_Copy_Surface.H b/FL/Fl_Copy_Surface.H
index 734335e45..5bf679789 100644
--- a/FL/Fl_Copy_Surface.H
+++ b/FL/Fl_Copy_Surface.H
@@ -19,9 +19,7 @@
#ifndef Fl_Copy_Surface_H
#define Fl_Copy_Surface_H
-#include <FL/Fl_Paged_Device.H>
-#include <FL/Fl_Printer.H>
-#include <FL/x.H>
+#include <FL/Fl_Widget_Surface.H>
/** Supports copying of graphical data to the clipboard.
diff --git a/FL/Fl_Image_Surface.H b/FL/Fl_Image_Surface.H
index 3a62fb081..20450be55 100644
--- a/FL/Fl_Image_Surface.H
+++ b/FL/Fl_Image_Surface.H
@@ -19,9 +19,10 @@
#ifndef Fl_Image_Surface_H
#define Fl_Image_Surface_H
-#include <FL/Fl_Copy_Surface.H>
+#include <FL/Fl_Widget_Surface.H>
#include <FL/Fl_Image.H>
#include <FL/Fl_Shared_Image.H>
+#include <FL/x.H>
/** Directs all graphics requests to an Fl_Image.
diff --git a/src/Fl_Image_Surface.cxx b/src/Fl_Image_Surface.cxx
index f072187e7..5e3b881f1 100644
--- a/src/Fl_Image_Surface.cxx
+++ b/src/Fl_Image_Surface.cxx
@@ -19,6 +19,7 @@
#include <FL/Fl_Image_Surface.H>
#include <FL/Fl_Printer.H>
#include <FL/Fl.H>
+#include <FL/x.H>
#include "config_lib.h"
#ifdef FL_CFG_GFX_QUARTZ
diff --git a/src/drivers/Xlib/Fl_Xlib_Copy_Surface.cxx b/src/drivers/Xlib/Fl_Xlib_Copy_Surface.cxx
index 77eb9ecd3..4d9baea83 100644
--- a/src/drivers/Xlib/Fl_Xlib_Copy_Surface.cxx
+++ b/src/drivers/Xlib/Fl_Xlib_Copy_Surface.cxx
@@ -18,6 +18,7 @@
#include "Fl_Xlib_Copy_Surface.H"
#include <FL/Fl.H>
+#include <FL/fl_draw.H>
Fl_Copy_Surface::Helper::Helper(int w, int h) : Fl_Widget_Surface(NULL) {
width = w;