FX_BOOL considered harmful, part 2.

fpdfsdk/include/fsdk_baseannot.h

Index: fpdfsdk/include/fsdk_baseannot.h
diff --git a/fpdfsdk/include/fsdk_baseannot.h b/fpdfsdk/include/fsdk_baseannot.h
index dcd295de9fbd1f65852b94b8a7892c3ce2a335d6..b9f1fcd4b1a0a6e26b992bc09dc22f88aac906f4 100644
--- a/fpdfsdk/include/fsdk_baseannot.h
+++ b/fpdfsdk/include/fsdk_baseannot.h
@@ -38,12 +38,12 @@ public:
 
 	CPDFSDK_DateTime&	operator = (const CPDFSDK_DateTime& datetime);
 	CPDFSDK_DateTime&	operator = (const FX_SYSTEMTIME& st);
-	FX_BOOL				operator == (CPDFSDK_DateTime& datetime);
-	FX_BOOL				operator != (CPDFSDK_DateTime& datetime);
-	FX_BOOL				operator > (CPDFSDK_DateTime& datetime);
-	FX_BOOL				operator >= (CPDFSDK_DateTime& datetime);
-	FX_BOOL				operator < (CPDFSDK_DateTime& datetime);
-	FX_BOOL				operator <= (CPDFSDK_DateTime& datetime);
+	bool				operator == (CPDFSDK_DateTime& datetime);
+	bool				operator != (CPDFSDK_DateTime& datetime);
+	bool				operator > (CPDFSDK_DateTime& datetime);
+	bool				operator >= (CPDFSDK_DateTime& datetime);
+	bool				operator < (CPDFSDK_DateTime& datetime);
+	bool				operator <= (CPDFSDK_DateTime& datetime);
 						operator time_t();
 
 	CPDFSDK_DateTime&	FromPDFDateTimeString(const CFX_ByteString& dtStr);
@@ -92,8 +92,8 @@ public:
 	void						SetTabOrder(int iTabOrder);
 
 	// Selection
-	FX_BOOL						IsSelected();
-	void						SetSelected(FX_BOOL bSelected);
+	bool						IsSelected();
+	void						SetSelected(bool bSelected);
 
 	CFX_ByteString				GetType() const;
 	virtual CFX_ByteString		GetSubType() const;
@@ -146,9 +146,9 @@ public:
 
 	void						SetColor(FX_COLORREF color);
 	void						RemoveColor();
-	FX_BOOL						GetColor(FX_COLORREF& color) const;
+	bool						GetColor(FX_COLORREF& color) const;
 
-	FX_BOOL						IsVisible() const;
+	bool						IsVisible() const;
 	//action
 
 	CPDF_Action					GetAction() const;
@@ -162,8 +162,8 @@ public:
 	virtual CPDF_Action			GetAAction(CPDF_AAction::AActionType eAAT);
 
 public:
-	FX_BOOL						IsAppearanceValid();
-	FX_BOOL						IsAppearanceValid(CPDF_Annot::AppearanceMode mode);
+	bool						IsAppearanceValid();
+	bool						IsAppearanceValid(CPDF_Annot::AppearanceMode mode);
 	void						DrawAppearance(CFX_RenderDevice* pDevice, const CPDF_Matrix* pUser2Device,
 		CPDF_Annot::AppearanceMode mode, const CPDF_RenderOptions* pOptions);
 	void						DrawBorder(CFX_RenderDevice* pDevice, const CPDF_Matrix* pUser2Device,
@@ -181,11 +181,11 @@ public:
 
 
 private:
-	FX_BOOL CreateFormFiller();
+	bool CreateFormFiller();
 protected:
 	CPDF_Annot*			m_pAnnot;
 	CPDFSDK_PageView*	m_pPageView;
-	FX_BOOL				m_bSelected;
+	bool				m_bSelected;
 	int					m_nTabOrder;
 
 };