Index: xfa/fwl/cfwl_checkbox.h |
diff --git a/xfa/fwl/cfwl_checkbox.h b/xfa/fwl/cfwl_checkbox.h |
index d228eee05706fd255fa1028ebcdda321d5a9f6b2..6df7440894e76284cbe68883f2858b7cc5ac42e7 100644 |
--- a/xfa/fwl/cfwl_checkbox.h |
+++ b/xfa/fwl/cfwl_checkbox.h |
@@ -13,33 +13,18 @@ |
#include "xfa/fwl/cfwl_widget.h" |
#include "xfa/fwl/cfwl_widgetproperties.h" |
-#define FWL_STYLEEXT_CKB_Left (0L << 0) |
-#define FWL_STYLEEXT_CKB_Center (1L << 0) |
-#define FWL_STYLEEXT_CKB_Right (2L << 0) |
-#define FWL_STYLEEXT_CKB_Top (0L << 2) |
-#define FWL_STYLEEXT_CKB_VCenter (1L << 2) |
-#define FWL_STYLEEXT_CKB_Bottom (2L << 2) |
-#define FWL_STYLEEXT_CKB_LeftText (1L << 4) |
-#define FWL_STYLEEXT_CKB_MultiLine (1L << 5) |
#define FWL_STYLEEXT_CKB_3State (1L << 6) |
#define FWL_STYLEEXT_CKB_RadioButton (1L << 7) |
-#define FWL_STYLEEXT_CKB_ShapeSolidSquare (0L << 8) |
-#define FWL_STYLEEXT_CKB_ShapeSunkenSquare (1L << 8) |
-#define FWL_STYLEEXT_CKB_ShapeSolidCircle (2L << 8) |
-#define FWL_STYLEEXT_CKB_ShapeSunkenCircle (3L << 8) |
-#define FWL_STYLEEXT_CKB_SignShapeCheck (0L << 10) |
+#define FWL_STYLEEXT_CKB_SignShapeCheck 0 |
#define FWL_STYLEEXT_CKB_SignShapeCircle (1L << 10) |
#define FWL_STYLEEXT_CKB_SignShapeCross (2L << 10) |
#define FWL_STYLEEXT_CKB_SignShapeDiamond (3L << 10) |
#define FWL_STYLEEXT_CKB_SignShapeSquare (4L << 10) |
#define FWL_STYLEEXT_CKB_SignShapeStar (5L << 10) |
-#define FWL_STYLEEXT_CKB_HLayoutMask (3L << 0) |
-#define FWL_STYLEEXT_CKB_VLayoutMask (3L << 2) |
-#define FWL_STYLEEXT_CKB_ShapeMask (3L << 8) |
#define FWL_STYLEEXT_CKB_SignShapeMask (7L << 10) |
#define FWL_STATE_CKB_Hovered (1 << FWL_WGTSTATE_MAX) |
#define FWL_STATE_CKB_Pressed (1 << (FWL_WGTSTATE_MAX + 1)) |
-#define FWL_STATE_CKB_Unchecked (0 << (FWL_WGTSTATE_MAX + 2)) |
+#define FWL_STATE_CKB_Unchecked 0 |
#define FWL_STATE_CKB_Checked (1 << (FWL_WGTSTATE_MAX + 2)) |
#define FWL_STATE_CKB_Neutral (2 << (FWL_WGTSTATE_MAX + 2)) |
#define FWL_STATE_CKB_CheckMask (3L << (FWL_WGTSTATE_MAX + 2)) |