Import of Xpdf 2.02 for merge

1 files changed, 9 insertions, 1 deletions

diff --git a/pdf/xpdf/XPDFCore.h b/pdf/xpdf/XPDFCore.h
index cf5308e..6435736 100644
--- a/pdf/xpdf/XPDFCore.h
+++ b/pdf/xpdf/XPDFCore.h
@@ -2,7 +2,7 @@
 //
 // XPDFCore.h
 //
-// Copyright 2002 Glyph & Cog, LLC
+// Copyright 2002-2003 Glyph & Cog, LLC
 //
 //========================================================================
 
@@ -24,6 +24,7 @@
 
 class GString;
 class GList;
+class BaseStream;
 class PDFDoc;
 class LinkAction;
 class LinkDest;
@@ -59,6 +60,7 @@ struct XPDFRegion {
   double xMin, yMin, xMax, yMax;
   Gulong color;
   Gulong selectColor;
+  GBool selectable;
 };
 
 //------------------------------------------------------------------------
@@ -97,6 +99,11 @@ public:
   int loadFile(GString *fileName, GString *ownerPassword = NULL,
 	       GString *userPassword = NULL);
 
+  // Load a new file, via a Stream instead of a file name.  Returns
+  // pdfOk or error code.
+  int loadFile(BaseStream *stream, GString *ownerPassword = NULL,
+	       GString *userPassword = NULL);
+
   // Resize the window to fit page <pg> of the current document.
   void resizeToPage(int pg);
 
@@ -253,6 +260,7 @@ private:
   GBool lastDragTop;		// last dragged selection edge was top/bottom
   static GString *currentSelection;  // selected text
   static XPDFCore *currentSelectionOwner;
+  static Atom targetsAtom;
 
   GBool panning;
   int panMX, panMY;