From ff46aaf499edcf153ee2f57c7016587aa96dcfa0 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 27 Jul 2015 11:55:29 -0700 Subject: FX Bool considered harmful, part 3 Try to reland this patch after fixing underlying issues that caused it to be reverted. fx_system.h is the only manual edit. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1258093002 . --- fpdfsdk/include/fx_systemhandler.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'fpdfsdk/include/fx_systemhandler.h') diff --git a/fpdfsdk/include/fx_systemhandler.h b/fpdfsdk/include/fx_systemhandler.h index bf59e452ea..30168d48b6 100644 --- a/fpdfsdk/include/fx_systemhandler.h +++ b/fpdfsdk/include/fx_systemhandler.h @@ -47,10 +47,10 @@ public: virtual void InvalidateRect(FX_HWND hWnd, FX_RECT rect) = 0; virtual void OutputSelectedRect(void* pFormFiller, CPDF_Rect&rect) = 0; - virtual FX_BOOL IsSelectionImplemented() = 0; + virtual bool IsSelectionImplemented() = 0; virtual CFX_WideString GetClipboardText(FX_HWND hWnd) = 0; - virtual FX_BOOL SetClipboardText(FX_HWND hWnd, CFX_WideString string) = 0; + virtual bool SetClipboardText(FX_HWND hWnd, CFX_WideString string) = 0; virtual void ClientToScreen(FX_HWND hWnd, int32_t& x, int32_t& y) = 0; virtual void ScreenToClient(FX_HWND hWnd, int32_t& x, int32_t& y) = 0; @@ -66,23 +66,23 @@ public: virtual void SetCursor(int32_t nCursorType) = 0; virtual FX_HMENU CreatePopupMenu() = 0; - virtual FX_BOOL AppendMenuItem(FX_HMENU hMenu, int32_t nIDNewItem, CFX_WideString string) = 0; - virtual FX_BOOL EnableMenuItem(FX_HMENU hMenu, int32_t nIDItem, FX_BOOL bEnabled) = 0; + virtual bool AppendMenuItem(FX_HMENU hMenu, int32_t nIDNewItem, CFX_WideString string) = 0; + virtual bool EnableMenuItem(FX_HMENU hMenu, int32_t nIDItem, bool bEnabled) = 0; virtual int32_t TrackPopupMenu(FX_HMENU hMenu, int32_t x, int32_t y, FX_HWND hParent) = 0; virtual void DestroyMenu(FX_HMENU hMenu) = 0; virtual CFX_ByteString GetNativeTrueTypeFont(int32_t nCharset) = 0; - virtual FX_BOOL FindNativeTrueTypeFont(int32_t nCharset, CFX_ByteString sFontFaceName) = 0; + virtual bool FindNativeTrueTypeFont(int32_t nCharset, CFX_ByteString sFontFaceName) = 0; virtual CPDF_Font* AddNativeTrueTypeFontToPDF(CPDF_Document* pDoc, CFX_ByteString sFontFaceName, uint8_t nCharset) = 0; virtual int32_t SetTimer(int32_t uElapse, TimerCallback lpTimerFunc) = 0; virtual void KillTimer(int32_t nID) = 0; - virtual FX_BOOL IsSHIFTKeyDown(FX_DWORD nFlag) = 0; - virtual FX_BOOL IsCTRLKeyDown(FX_DWORD nFlag) = 0; - virtual FX_BOOL IsALTKeyDown(FX_DWORD nFlag) = 0; - virtual FX_BOOL IsINSERTKeyDown(FX_DWORD nFlag) = 0; + virtual bool IsSHIFTKeyDown(FX_DWORD nFlag) = 0; + virtual bool IsCTRLKeyDown(FX_DWORD nFlag) = 0; + virtual bool IsALTKeyDown(FX_DWORD nFlag) = 0; + virtual bool IsINSERTKeyDown(FX_DWORD nFlag) = 0; virtual FX_SYSTEMTIME GetLocalTime() = 0; -- cgit v1.2.3