Kill FX_READER_DLL symbol
It is never defined, and the declspec()s based on it appear
inconsistently used.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1257163002 .
diff --git a/fpdfsdk/include/fxedit/fx_edit.h b/fpdfsdk/include/fxedit/fx_edit.h
index bf46e91..d154cb2 100644
--- a/fpdfsdk/include/fxedit/fx_edit.h
+++ b/fpdfsdk/include/fxedit/fx_edit.h
@@ -46,16 +46,6 @@
#define FX_EDIT_ISLATINWORD(u) (u == 0x2D || (u <= 0x005A && u >= 0x0041) || (u <= 0x007A && u >= 0x0061) || (u <= 0x02AF && u >= 0x00C0))
-#ifdef FX_READER_DLL
- #ifdef FXET_EXPORT
- #define FXET_CLASS __declspec(dllexport)
- #else
- #define FXET_CLASS
- #endif
-#else
- #define FXET_CLASS
-#endif
-
#ifndef DEFAULT_CHARSET
#define DEFAULT_CHARSET 1
#endif
@@ -171,7 +161,7 @@
virtual CFX_WideString GetUndoTitle() = 0;
};
-class FXET_CLASS IFX_Edit
+class IFX_Edit
{
public:
static IFX_Edit* NewEdit();
@@ -433,7 +423,7 @@
virtual void IOnInvalidateRect(CPDF_Rect * pRect) = 0;
};
-class FXET_CLASS IFX_List
+class IFX_List
{
public:
static IFX_List* NewList();
diff --git a/fpdfsdk/include/pdfwindow/PWL_Button.h b/fpdfsdk/include/pdfwindow/PWL_Button.h
index 2bf2eea..4937841 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Button.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Button.h
@@ -9,7 +9,7 @@
#include "PWL_Wnd.h"
-class PWL_CLASS CPWL_Button : public CPWL_Wnd
+class CPWL_Button : public CPWL_Wnd
{
public:
CPWL_Button();
diff --git a/fpdfsdk/include/pdfwindow/PWL_ComboBox.h b/fpdfsdk/include/pdfwindow/PWL_ComboBox.h
index 3f8604f..7a86ccd 100644
--- a/fpdfsdk/include/pdfwindow/PWL_ComboBox.h
+++ b/fpdfsdk/include/pdfwindow/PWL_ComboBox.h
@@ -18,7 +18,7 @@
virtual ~CPWL_CBEdit(){};
};
-class PWL_CLASS CPWL_CBListBox : public CPWL_ListBox
+class CPWL_CBListBox : public CPWL_ListBox
{
public:
CPWL_CBListBox(){};
@@ -48,7 +48,7 @@
};
-class PWL_CLASS CPWL_ComboBox : public CPWL_Wnd
+class CPWL_ComboBox : public CPWL_Wnd
{
public:
CPWL_ComboBox();
diff --git a/fpdfsdk/include/pdfwindow/PWL_Edit.h b/fpdfsdk/include/pdfwindow/PWL_Edit.h
index 97147a9..5c90ff7 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Edit.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Edit.h
@@ -28,7 +28,7 @@
virtual void OnAfterKeyStroke(FX_BOOL bEditOrList, void* pPrivateData, FX_BOOL & bExit, FX_DWORD nFlag) = 0;
};
-class PWL_CLASS CPWL_Edit : public CPWL_EditCtrl, public IFX_Edit_OprNotify
+class CPWL_Edit : public CPWL_EditCtrl, public IFX_Edit_OprNotify
{
public:
CPWL_Edit();
diff --git a/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h b/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h
index 9b088b1..273b384 100644
--- a/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h
+++ b/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h
@@ -56,7 +56,7 @@
virtual void OnAddUndo(CPWL_Edit* pEdit) {}
};
-class PWL_CLASS CPWL_EditCtrl : public CPWL_Wnd, public IFX_Edit_Notify
+class CPWL_EditCtrl : public CPWL_Wnd, public IFX_Edit_Notify
{
friend class CPWL_Edit_Notify;
diff --git a/fpdfsdk/include/pdfwindow/PWL_FontMap.h b/fpdfsdk/include/pdfwindow/PWL_FontMap.h
index d32cc93..562d5df 100644
--- a/fpdfsdk/include/pdfwindow/PWL_FontMap.h
+++ b/fpdfsdk/include/pdfwindow/PWL_FontMap.h
@@ -50,16 +50,7 @@
#endif
-#ifndef PWL_CLASS
-
- #ifdef FX_READER_DLL
- #define PWL_CLASS __declspec(dllexport)
- #else
- #define PWL_CLASS
- #endif
-#endif
-
-class PWL_CLASS CPWL_FontMap : public IFX_Edit_FontMap
+class CPWL_FontMap : public IFX_Edit_FontMap
{
public:
CPWL_FontMap(IFX_SystemHandler* pSystemHandler);
@@ -124,7 +115,7 @@
IFX_SystemHandler* m_pSystemHandler;
};
-class PWL_CLASS CPWL_DocFontMap : public CPWL_FontMap
+class CPWL_DocFontMap : public CPWL_FontMap
{
public:
CPWL_DocFontMap(IFX_SystemHandler* pSystemHandler, CPDF_Document* pAttachedDoc);
diff --git a/fpdfsdk/include/pdfwindow/PWL_Icon.h b/fpdfsdk/include/pdfwindow/PWL_Icon.h
index 44a5c0c..cff4e8c 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Icon.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Icon.h
@@ -10,7 +10,7 @@
#include "../../../core/include/fxcrt/fx_string.h"
#include "PWL_Wnd.h"
-class PWL_CLASS CPWL_Image : public CPWL_Wnd
+class CPWL_Image : public CPWL_Wnd
{
public:
CPWL_Image();
@@ -34,7 +34,7 @@
CFX_ByteString m_sImageAlias;
};
-class PWL_CLASS CPWL_Icon : public CPWL_Image
+class CPWL_Icon : public CPWL_Image
{
public:
CPWL_Icon();
diff --git a/fpdfsdk/include/pdfwindow/PWL_IconList.h b/fpdfsdk/include/pdfwindow/PWL_IconList.h
index 2f6b323..f7e9add 100644
--- a/fpdfsdk/include/pdfwindow/PWL_IconList.h
+++ b/fpdfsdk/include/pdfwindow/PWL_IconList.h
@@ -94,7 +94,7 @@
int32_t m_nListCount;
};
-class PWL_CLASS CPWL_IconList : public CPWL_Wnd
+class CPWL_IconList : public CPWL_Wnd
{
public:
CPWL_IconList(int32_t nListCount);
diff --git a/fpdfsdk/include/pdfwindow/PWL_Label.h b/fpdfsdk/include/pdfwindow/PWL_Label.h
index 7f28189..3df547e 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Label.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Label.h
@@ -11,7 +11,7 @@
class IFX_Edit;
-class PWL_CLASS CPWL_Label : public CPWL_Wnd
+class CPWL_Label : public CPWL_Wnd
{
public:
CPWL_Label();
diff --git a/fpdfsdk/include/pdfwindow/PWL_ListBox.h b/fpdfsdk/include/pdfwindow/PWL_ListBox.h
index 97a4529..7c37fb3 100644
--- a/fpdfsdk/include/pdfwindow/PWL_ListBox.h
+++ b/fpdfsdk/include/pdfwindow/PWL_ListBox.h
@@ -37,7 +37,7 @@
CPWL_ListBox* m_pList;
};
-class PWL_CLASS CPWL_ListBox : public CPWL_Wnd
+class CPWL_ListBox : public CPWL_Wnd
{
public:
CPWL_ListBox();
diff --git a/fpdfsdk/include/pdfwindow/PWL_Note.h b/fpdfsdk/include/pdfwindow/PWL_Note.h
index a60eba3..29b7857 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Note.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Note.h
@@ -82,7 +82,7 @@
virtual CPWL_Edit* GetEdit() const = 0;
};
-class PWL_CLASS CPWL_Note_Icon : public CPWL_Wnd
+class CPWL_Note_Icon : public CPWL_Wnd
{
public:
CPWL_Note_Icon();
@@ -213,7 +213,7 @@
CPWL_Note_Edit* m_pEdit;
};
-class PWL_CLASS CPWL_NoteItem : public CPWL_Wnd, public IPWL_NoteItem
+class CPWL_NoteItem : public CPWL_Wnd, public IPWL_NoteItem
{
public:
CPWL_NoteItem();
@@ -293,7 +293,7 @@
FX_BOOL m_bAllowModify;
};
-class PWL_CLASS CPWL_Note : public CPWL_NoteItem
+class CPWL_Note : public CPWL_NoteItem
{
public:
CPWL_Note(IPopup_Note* pPopupNote, IPWL_NoteNotify* pNoteNotify, IPWL_NoteHandler* pNoteHandler);
diff --git a/fpdfsdk/include/pdfwindow/PWL_Signature.h b/fpdfsdk/include/pdfwindow/PWL_Signature.h
index c945277..d9be322 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Signature.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Signature.h
@@ -32,7 +32,7 @@
CFX_DIBSource* m_pImage;
};
-class PWL_CLASS CPWL_Signature : public CPWL_Wnd
+class CPWL_Signature : public CPWL_Wnd
{
public:
CPWL_Signature();
diff --git a/fpdfsdk/include/pdfwindow/PWL_SpecialButton.h b/fpdfsdk/include/pdfwindow/PWL_SpecialButton.h
index f6659df..31787d7 100644
--- a/fpdfsdk/include/pdfwindow/PWL_SpecialButton.h
+++ b/fpdfsdk/include/pdfwindow/PWL_SpecialButton.h
@@ -9,7 +9,7 @@
#include "PWL_Button.h"
-class PWL_CLASS CPWL_PushButton : public CPWL_Button
+class CPWL_PushButton : public CPWL_Button
{
public:
CPWL_PushButton();
@@ -19,7 +19,7 @@
virtual CPDF_Rect GetFocusRect() const;
};
-class PWL_CLASS CPWL_CheckBox : public CPWL_Button
+class CPWL_CheckBox : public CPWL_Button
{
public:
CPWL_CheckBox();
@@ -36,7 +36,7 @@
FX_BOOL m_bChecked;
};
-class PWL_CLASS CPWL_RadioButton : public CPWL_Button
+class CPWL_RadioButton : public CPWL_Button
{
public:
CPWL_RadioButton();
diff --git a/fpdfsdk/include/pdfwindow/PWL_Utils.h b/fpdfsdk/include/pdfwindow/PWL_Utils.h
index 2da0f42..b58f30e 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Utils.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Utils.h
@@ -104,7 +104,7 @@
class IPWL_SpellCheck;
-class PWL_CLASS CPWL_Utils
+class CPWL_Utils
{
public:
static CPDF_Rect InflateRect(const CPDF_Rect& rcRect, FX_FLOAT fSize);
diff --git a/fpdfsdk/include/pdfwindow/PWL_Wnd.h b/fpdfsdk/include/pdfwindow/PWL_Wnd.h
index c5b6ca4..f2b996c 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Wnd.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Wnd.h
@@ -21,19 +21,6 @@
class IPWL_Provider;
class IPWL_SpellCheck;
-#ifdef FX_READER_DLL
- #ifdef PWL_EXPORT
- #define PWL_CLASS __declspec(dllexport)
- #define PWL_FUNCTION PWL_CLASS
- #else
- #define PWL_CLASS
- #define PWL_FUNCTION
- #endif
-#else
- #define PWL_CLASS
- #define PWL_FUNCTION
-#endif
-
//window styles
#define PWS_CHILD 0x80000000L
#define PWS_BORDER 0x40000000L
@@ -115,7 +102,7 @@
int32_t nPhase;
};
-struct PWL_CLASS CPWL_Color
+struct CPWL_Color
{
CPWL_Color(int32_t type = COLORTYPE_TRANSPARENT, FX_FLOAT color1 = 0.0f, FX_FLOAT color2 = 0.0f, FX_FLOAT color3 = 0.0f, FX_FLOAT color4 = 0.0f)
: nColorType(type), fColor1(color1), fColor2(color2), fColor3(color3), fColor4(color4)
@@ -273,7 +260,7 @@
IFX_SystemHandler* m_pSystemHandler;
};
-class PWL_CLASS CPWL_TimerHandler
+class CPWL_TimerHandler
{
public:
CPWL_TimerHandler();
@@ -288,7 +275,7 @@
CPWL_Timer* m_pTimer;
};
-class PWL_CLASS CPWL_Wnd : public CPWL_TimerHandler
+class CPWL_Wnd : public CPWL_TimerHandler
{
friend class CPWL_MsgControl;
public:
