Synched with Xpdf 1.01

[evince.git] / pdf / xpdf / Annot.h

diff --git a/pdf/xpdf/FormWidget.h b/pdf/xpdf/Annot.h
similarity index 55%
rename from pdf/xpdf/FormWidget.h
rename to pdf/xpdf/Annot.h
index d746083bf40e0e00e4e189be62d556ada3868937..4113a0bd59609fb1c6751ce15ebaf4657bdcfbd5 100644 (file)
--- a/pdf/xpdf/FormWidget.h
+++ b/pdf/xpdf/Annot.h
@@ -1,65 +1,67 @@
 //========================================================================
 //
-// FormWidget.h
+// Annot.h
 //
-// Copyright 2000 Derek B. Noonburg
+// Copyright 2000-2002 Glyph & Cog, LLC
 //
 //========================================================================
 
-#ifndef FORMWIDGET_H
-#define FORMWIDGET_H
+#ifndef ANNOT_H
+#define ANNOT_H
 
 #ifdef __GNUC__
 #pragma interface
 #endif
 
+class XRef;
 class Gfx;
 
 //------------------------------------------------------------------------
-// FormWidget
+// Annot
 //------------------------------------------------------------------------
 
-class FormWidget {
+class Annot {
 public:
 
-  FormWidget(Dict *dict);
-  ~FormWidget();
+  Annot(XRef *xrefA, Dict *dict);
+  ~Annot();
   GBool isOk() { return ok; }
 
   void draw(Gfx *gfx);
 
   // Get appearance object.
-  Object *getAppearance(Object *obj) { return appearance.fetch(obj); }
+  Object *getAppearance(Object *obj) { return appearance.fetch(xref, obj); }
 
 private:
 
+  XRef *xref;                  // the xref table for this PDF file
   Object appearance;           // a reference to the Form XObject stream
                                //   for the normal appearance
-  double xMin, yMin,           // widget rectangle
+  double xMin, yMin,           // annotation rectangle
          xMax, yMax;
   GBool ok;
 };
 
 //------------------------------------------------------------------------
-// FormWidgets
+// Annots
 //------------------------------------------------------------------------
 
-class FormWidgets {
+class Annots {
 public:
 
-  // Extract widgets from array of annotations.
-  FormWidgets(Object *annots);
+  // Extract non-link annotations from array of annotations.
+  Annots(XRef *xref, Object *annotsObj);
 
-  ~FormWidgets();
+  ~Annots();
 
-  // Iterate through list of widgets.
-  int getNumWidgets() { return nWidgets; }
-  FormWidget *getWidget(int i) { return widgets[i]; }
+  // Iterate through list of annotations.
+  int getNumAnnots() { return nAnnots; }
+  Annot *getAnnot(int i) { return annots[i]; }
 
 private:
 
-  FormWidget **widgets;
-  int nWidgets;
+  Annot **annots;
+  int nAnnots;
 };
 
 #endif