From c104dfaf570df2ba68ecacd6c1a66c600de76dd4 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Thu, 21 Apr 2016 10:21:53 -0700 Subject: Remove unused FWL flags No usages, removed. Review URL: https://codereview.chromium.org/1903993003 --- xfa/fee/ifde_txtedtengine.h | 5 ----- xfa/fwl/basewidget/ifwl_barcode.h | 1 - xfa/fwl/basewidget/ifwl_edit.h | 5 ----- xfa/fwl/basewidget/ifwl_listbox.h | 3 --- xfa/fwl/basewidget/ifwl_monthcalendar.h | 1 - xfa/fwl/basewidget/ifwl_scrollbar.h | 5 ----- xfa/fwl/core/fwl_widgetdef.h | 2 -- xfa/fwl/theme/cfwl_utils.h | 3 --- 8 files changed, 25 deletions(-) diff --git a/xfa/fee/ifde_txtedtengine.h b/xfa/fee/ifde_txtedtengine.h index 6a31af6bd8..e03a53e1ab 100644 --- a/xfa/fee/ifde_txtedtengine.h +++ b/xfa/fee/ifde_txtedtengine.h @@ -17,11 +17,6 @@ class IFDE_TxtEdtParag; typedef struct FDE_HTXTEDTFIND_ { void* pData; } * FDE_HTXTEDTFIND; -#define FDE_TXTEDT_FIND_FLAGS_Prev (0L << 0) -#define FDE_TXTEDT_FIND_FLAGS_Next (1L << 0) -#define FDE_TXTEDT_FIND_FLAGS_WholeWord (1L << 1) -#define FDE_TXTEDT_FIND_FLAGS_NoCase (1L << 2) - #define FDE_TEXTEDITMODE_MultiLines (1L << 0) #define FDE_TEXTEDITMODE_AutoLineWrap (1L << 1) #define FDE_TEXTEDITMODE_ReadOnly (1L << 2) diff --git a/xfa/fwl/basewidget/ifwl_barcode.h b/xfa/fwl/basewidget/ifwl_barcode.h index a506dd8002..4263177994 100644 --- a/xfa/fwl/basewidget/ifwl_barcode.h +++ b/xfa/fwl/basewidget/ifwl_barcode.h @@ -27,7 +27,6 @@ class CFWL_WidgetImpProperties; #define FWL_BCDATTRIBUTE_VERSION (1L << 10) #define FWL_BCDATTRIBUTE_ECLEVEL (1L << 11) #define FWL_BCDATTRIBUTE_TRUNCATED (1L << 12) -#define FWL_BCUPDATECMD_Data FWL_WGTUPDATECMD_User class IFWL_BarcodeDP : public IFWL_EditDP { public: diff --git a/xfa/fwl/basewidget/ifwl_edit.h b/xfa/fwl/basewidget/ifwl_edit.h index b1de2f91e8..caa2b530b8 100644 --- a/xfa/fwl/basewidget/ifwl_edit.h +++ b/xfa/fwl/basewidget/ifwl_edit.h @@ -47,7 +47,6 @@ #define FWL_STYLEEXT_EDT_ShowScrollbarFocus (1L << 25) #define FWL_STYLEEXT_EDT_OuterScrollbar (1L << 26) #define FWL_STYLEEXT_EDT_LastLineHeight (1L << 27) -#define FWL_STATE_EDT_Editing (1 << FWL_WGTSTATE_MAX) #define FWL_PARTDATA_EDT_Background 0 #define FWL_PARTDATA_EDT_StaticBackground 1 // TODO(dsinclair): Event hash is hash of string, cleanup. pdfium:474 @@ -57,10 +56,6 @@ #define FWL_EVTHASH_EDT_CheckWord 2897181520 #define FWL_EVTHASH_EDT_GetSuggestWords 315782791 #define FWL_EVTHASH_EDT_TextFull 2158580174 -#define FWL_EDT_FIND_FLAGS_Prev (0L << 0) -#define FWL_EDT_FIND_FLAGS_Next (1L << 0) -#define FWL_EDT_FIND_FLAGS_WholeWord (1L << 1) -#define FWL_EDT_FIND_FLAGS_NoCase (1L << 2) typedef struct FWL_HEDTFIND_ { void* pData; } * FWL_HEDTFIND; diff --git a/xfa/fwl/basewidget/ifwl_listbox.h b/xfa/fwl/basewidget/ifwl_listbox.h index e80a3289f8..af4335aa03 100644 --- a/xfa/fwl/basewidget/ifwl_listbox.h +++ b/xfa/fwl/basewidget/ifwl_listbox.h @@ -30,9 +30,6 @@ #define FWL_ITEMSTATE_LTB_Selected (1L << 0) #define FWL_ITEMSTATE_LTB_Focused (1L << 1) #define FWL_ITEMSTATE_LTB_Checked (1L << 2) -#define FWL_WGTHITTEST_LTB_Item FWL_WGTHITTEST_MAX + 1 -#define FWL_WGTHITTEST_LTB_HScrollBar FWL_WGTHITTEST_MAX + 2 -#define FWL_WGTHITTEST_LTB_VScrollBar FWL_WGTHITTEST_MAX + 3 // TODO(dsinclair): Event hash is hash of string, cleanup. pdfium:474 #define FWL_EVTHASH_LTB_SelChanged 1701781688 #define FWL_EVTHASH_LTB_DrawItem 1050853991 diff --git a/xfa/fwl/basewidget/ifwl_monthcalendar.h b/xfa/fwl/basewidget/ifwl_monthcalendar.h index a635b1cde9..ad3ce1d62e 100644 --- a/xfa/fwl/basewidget/ifwl_monthcalendar.h +++ b/xfa/fwl/basewidget/ifwl_monthcalendar.h @@ -22,7 +22,6 @@ #define FWL_ITEMSTATE_MCD_Flag (1L << 0) #define FWL_ITEMSTATE_MCD_Selected (1L << 1) #define FWL_ITEMSTATE_MCD_Focused (1L << 2) -#define FWL_EVENT_MCD_DATESELECTED L"FWL_EVENT_MCD_DateSelected" #define FWL_NOTEHASH_MCD_DATASELECTED 1085596932 // TODO(dsinclair): Event hash is hash of string, cleanup. pdfium:474 #define FWL_EVTHASH_MCD_DateChanged 54212227 diff --git a/xfa/fwl/basewidget/ifwl_scrollbar.h b/xfa/fwl/basewidget/ifwl_scrollbar.h index 2f2994b8f0..e199713686 100644 --- a/xfa/fwl/basewidget/ifwl_scrollbar.h +++ b/xfa/fwl/basewidget/ifwl_scrollbar.h @@ -18,11 +18,6 @@ #define FWL_CLASSHASH_ScrollBar 2826584844 #define FWL_STYLEEXT_SCB_Horz (0L << 0) #define FWL_STYLEEXT_SCB_Vert (1L << 0) -#define FWL_WGTHITTEST_SCB_ForeArrow FWL_WGTHITTEST_MAX + 1 -#define FWL_WGTHITTEST_SCB_BackArrow FWL_WGTHITTEST_MAX + 2 -#define FWL_WGTHITTEST_SCB_LowerTrack FWL_WGTHITTEST_MAX + 3 -#define FWL_WGTHITTEST_SCB_UpperTrack FWL_WGTHITTEST_MAX + 4 -#define FWL_WGTHITTEST_SCB_Thumb FWL_WGTHITTEST_MAX + 5 enum FWL_SCBCODE { FWL_SCBCODE_None = 1, diff --git a/xfa/fwl/core/fwl_widgetdef.h b/xfa/fwl/core/fwl_widgetdef.h index 849ba6fc7b..3b858951e5 100644 --- a/xfa/fwl/core/fwl_widgetdef.h +++ b/xfa/fwl/core/fwl_widgetdef.h @@ -243,7 +243,5 @@ #define FWL_VKEY_PA1 0xFD #define FWL_VKEY_OEM_Clear 0xFE #define FWL_VKEY_Unknown 0 -#define FWL_VKEYSTATE_Toggled 0x0001 -#define FWL_VKEYSTATE_Down 0x0100 #endif // XFA_FWL_CORE_FWL_WIDGETDEF_H_ diff --git a/xfa/fwl/theme/cfwl_utils.h b/xfa/fwl/theme/cfwl_utils.h index f2aa381d63..701b647174 100644 --- a/xfa/fwl/theme/cfwl_utils.h +++ b/xfa/fwl/theme/cfwl_utils.h @@ -31,10 +31,7 @@ enum FWLTHEME_DIRECTION { #define FWLTHEME_BEZIER FX_BEZIER #define FWLTHEME_PI FX_PI -#define FWLTHEME_COLOR_EDGELT1 (ArgbEncode(255, 172, 168, 153)) -#define FWLTHEME_COLOR_EDGELT2 (ArgbEncode(255, 113, 111, 100)) #define FWLTHEME_COLOR_EDGERB1 (ArgbEncode(255, 241, 239, 226)) -#define FWLTHEME_COLOR_EDGERB2 (ArgbEncode(255, 255, 255, 255)) #define FWLTHEME_COLOR_Background (ArgbEncode(255, 236, 233, 216)) #define FWLTHEME_COLOR_BKSelected (ArgbEncode(255, 153, 193, 218)) #define FWLTHEME_COLOR_Green_BKSelected (ArgbEncode(255, 147, 160, 112)) -- cgit v1.2.3