Remove more cruft from fx_system.h
[pdfium.git] / fpdfsdk / include / fsdk_baseform.h
index 915d411..85ab3e6 100644 (file)
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FSDK_BASEFORM_H_
-#define _FSDK_BASEFORM_H_
+#ifndef FPDFSDK_INCLUDE_FSDK_BASEFORM_H_
+#define FPDFSDK_INCLUDE_FSDK_BASEFORM_H_
 
 #if _FX_OS_ == _FX_ANDROID_
 #include "time.h"
 #include <ctime>
 #endif
 
-class CPDFSDK_Document;
-class  CPDFSDK_DateTime;
-struct CPWL_Color;
+#include "../../core/include/fpdfapi/fpdf_parser.h"
+#include "../../core/include/fpdfdoc/fpdf_doc.h"
+#include "../../core/include/fxcrt/fx_basic.h"
+#include "../../core/include/fxge/fx_dib.h"
+#include "fsdk_baseannot.h"
+
 class CFFL_FormFiller;
-class CPDFSDK_PageView;
+class CPDFSDK_Annot;
+class CPDFSDK_DateTime;
+class CPDFSDK_Document;
 class CPDFSDK_InterForm;
-
+class CPDFSDK_PageView;
+class CPDF_Action;
+class CPDF_FormField;
+struct CPWL_Color;
 
 typedef struct _PDFSDK_FieldAction
 {
@@ -253,34 +261,28 @@ private:
 
 #define CPDFSDK_Annots                         CFX_ArrayTemplate<CPDFSDK_Annot*>
 #define CPDFSDK_SortAnnots                     CGW_ArrayTemplate<CPDFSDK_Annot*>
-class CBA_AnnotIterator 
+class CBA_AnnotIterator
 {
 public:
        CBA_AnnotIterator(CPDFSDK_PageView* pPageView, const CFX_ByteString& sType, const CFX_ByteString& sSubType);
-       virtual ~CBA_AnnotIterator();
-       
-       virtual CPDFSDK_Annot*                          GetFirstAnnot();
-       virtual CPDFSDK_Annot*                          GetLastAnnot();
-       virtual CPDFSDK_Annot*                          GetNextAnnot(CPDFSDK_Annot* pAnnot);
-       virtual CPDFSDK_Annot*                          GetPrevAnnot(CPDFSDK_Annot* pAnnot);
-       
-       virtual void                                            Release(){delete this;}
-       
+       ~CBA_AnnotIterator();
+
+       CPDFSDK_Annot*                          GetFirstAnnot();
+       CPDFSDK_Annot*                          GetLastAnnot();
+       CPDFSDK_Annot*                          GetNextAnnot(CPDFSDK_Annot* pAnnot);
+       CPDFSDK_Annot*                          GetPrevAnnot(CPDFSDK_Annot* pAnnot);
+
 private:
        void                                                            GenerateResults();
        static int                                                      CompareByLeft(CPDFSDK_Annot* p1, CPDFSDK_Annot* p2);
        static int                                                      CompareByTop(CPDFSDK_Annot* p1, CPDFSDK_Annot* p2);
-       
        static CPDF_Rect                                        GetAnnotRect(CPDFSDK_Annot* pAnnot);
-       
-private:
+
        CPDFSDK_PageView*                                       m_pPageView;
        CFX_ByteString                                          m_sType;
        CFX_ByteString                                          m_sSubType;
        int                                                                     m_nTabs;
-       
        CPDFSDK_Annots                                          m_Annots;
 };
 
-#endif //#define _FSDK_BASEFORM_H_
-
+#endif  // FPDFSDK_INCLUDE_FSDK_BASEFORM_H_