From 2c3d8060505f382477dde7e79618480d774f19c3 Mon Sep 17 00:00:00 2001
From: Tom Sepez <tsepez@chromium.org>
Date: Mon, 27 Jul 2015 14:35:02 -0700
Subject: Merge to XFA: Kill FX_READER_DLL symbol Original Review URL:
 https://codereview.chromium.org/1257163002 .

R=thestig@chromium.org
TBR=thestig@chromium.org

Review URL: https://codereview.chromium.org/1259113003 .
---
 fpdfsdk/include/fxedit/fx_edit.h              | 14 ++------------
 fpdfsdk/include/pdfwindow/PWL_Button.h        |  2 +-
 fpdfsdk/include/pdfwindow/PWL_ComboBox.h      |  4 ++--
 fpdfsdk/include/pdfwindow/PWL_Edit.h          |  2 +-
 fpdfsdk/include/pdfwindow/PWL_EditCtrl.h      |  2 +-
 fpdfsdk/include/pdfwindow/PWL_FontMap.h       | 13 ++-----------
 fpdfsdk/include/pdfwindow/PWL_Icon.h          |  4 ++--
 fpdfsdk/include/pdfwindow/PWL_IconList.h      |  2 +-
 fpdfsdk/include/pdfwindow/PWL_Label.h         |  2 +-
 fpdfsdk/include/pdfwindow/PWL_ListBox.h       |  2 +-
 fpdfsdk/include/pdfwindow/PWL_Note.h          |  6 +++---
 fpdfsdk/include/pdfwindow/PWL_Signature.h     |  2 +-
 fpdfsdk/include/pdfwindow/PWL_SpecialButton.h |  6 +++---
 fpdfsdk/include/pdfwindow/PWL_Utils.h         |  2 +-
 fpdfsdk/include/pdfwindow/PWL_Wnd.h           | 19 +++----------------
 15 files changed, 25 insertions(+), 57 deletions(-)

(limited to 'fpdfsdk/include')

diff --git a/fpdfsdk/include/fxedit/fx_edit.h b/fpdfsdk/include/fxedit/fx_edit.h
index bf46e91819..d154cb2290 100644
--- a/fpdfsdk/include/fxedit/fx_edit.h
+++ b/fpdfsdk/include/fxedit/fx_edit.h
@@ -46,16 +46,6 @@ struct CPVT_WordRange;
 
 #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 @@ public:
 	virtual CFX_WideString					GetUndoTitle() = 0;
 };
 
-class FXET_CLASS IFX_Edit
+class IFX_Edit
 {
 public:
 	static IFX_Edit*						NewEdit();
@@ -433,7 +423,7 @@ public:
 	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 2bf2eea865..4937841819 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 3f8604fb62..7a86ccd0c2 100644
--- a/fpdfsdk/include/pdfwindow/PWL_ComboBox.h
+++ b/fpdfsdk/include/pdfwindow/PWL_ComboBox.h
@@ -18,7 +18,7 @@ public:
 	virtual ~CPWL_CBEdit(){};
 };
 
-class PWL_CLASS CPWL_CBListBox : public CPWL_ListBox
+class CPWL_CBListBox : public CPWL_ListBox
 {
 public:
 	CPWL_CBListBox(){};
@@ -48,7 +48,7 @@ public:
 
 };
 
-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 6b31b9230d..b5debac7fc 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Edit.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Edit.h
@@ -31,7 +31,7 @@ public:
 	virtual void					OnPopupPostOpen(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 9b088b1162..273b3842c8 100644
--- a/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h
+++ b/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h
@@ -56,7 +56,7 @@ public:
 	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 d32cc93078..562d5df9c1 100644
--- a/fpdfsdk/include/pdfwindow/PWL_FontMap.h
+++ b/fpdfsdk/include/pdfwindow/PWL_FontMap.h
@@ -50,16 +50,7 @@ struct CPWL_FontMap_Native
 
 #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 @@ private:
 	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 44a5c0cbaf..cff4e8ca69 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 @@ protected:
 	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 2f6b323773..f7e9adda7b 100644
--- a/fpdfsdk/include/pdfwindow/PWL_IconList.h
+++ b/fpdfsdk/include/pdfwindow/PWL_IconList.h
@@ -94,7 +94,7 @@ private:
 	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 7f28189199..3df547e0b2 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 97a4529af9..7c37fb30ef 100644
--- a/fpdfsdk/include/pdfwindow/PWL_ListBox.h
+++ b/fpdfsdk/include/pdfwindow/PWL_ListBox.h
@@ -37,7 +37,7 @@ private:
 	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 a60eba30dd..29b7857e20 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Note.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Note.h
@@ -82,7 +82,7 @@ public:
 	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 @@ private:
 	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 @@ private:
 	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 c94527772e..d9be322a7d 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Signature.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Signature.h
@@ -32,7 +32,7 @@ private:
 	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 f6659dfb00..31787d79ed 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 @@ public:
 	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 @@ private:
 	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 2da0f42180..b58f30e399 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Utils.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Utils.h
@@ -104,7 +104,7 @@ public:
 
 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 3ef4e67620..67b28cf424 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Wnd.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Wnd.h
@@ -21,19 +21,6 @@ class IFX_SystemHandler;
 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 @@ struct CPWL_Dash
 	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 @@ private:
 	IFX_SystemHandler*					m_pSystemHandler;
 };
 
-class PWL_CLASS CPWL_TimerHandler
+class CPWL_TimerHandler
 {
 public:
 	CPWL_TimerHandler();
@@ -288,7 +275,7 @@ private:
 	CPWL_Timer*							m_pTimer;
 };
 
-class PWL_CLASS CPWL_Wnd : public CPWL_TimerHandler
+class CPWL_Wnd : public CPWL_TimerHandler
 {
 	friend class CPWL_MsgControl;
 public:
-- 
cgit v1.2.3