From dc8678a4a912c91ee8174239ca109bd4c7937aad Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Wed, 13 Nov 2013 17:43:17 +0000 Subject: [PATCH] Fixed clashing attribute values git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75181 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/textctrl.h | 4 ++-- interface/wx/textctrl.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h index 526b548fbf..ce922bb631 100644 --- a/include/wx/textctrl.h +++ b/include/wx/textctrl.h @@ -205,8 +205,8 @@ enum wxTextAttrFlags wxTEXT_ATTR_EFFECTS = 0x00800000, wxTEXT_ATTR_OUTLINE_LEVEL = 0x01000000, - wxTEXT_ATTR_AVOID_PAGE_BREAK_BEFORE = 0x02000000, - wxTEXT_ATTR_AVOID_PAGE_BREAK_AFTER = 0x04000000, + wxTEXT_ATTR_AVOID_PAGE_BREAK_BEFORE = 0x20000000, + wxTEXT_ATTR_AVOID_PAGE_BREAK_AFTER = 0x40000000, /*! * Character and paragraph combined styles diff --git a/interface/wx/textctrl.h b/interface/wx/textctrl.h index 0931938139..5756cb792d 100644 --- a/interface/wx/textctrl.h +++ b/interface/wx/textctrl.h @@ -132,8 +132,8 @@ enum wxTextAttrFlags wxTEXT_ATTR_EFFECTS = 0x00800000, wxTEXT_ATTR_OUTLINE_LEVEL = 0x01000000, - wxTEXT_ATTR_AVOID_PAGE_BREAK_BEFORE = 0x02000000, - wxTEXT_ATTR_AVOID_PAGE_BREAK_AFTER = 0x04000000, + wxTEXT_ATTR_AVOID_PAGE_BREAK_BEFORE = 0x20000000, + wxTEXT_ATTR_AVOID_PAGE_BREAK_AFTER = 0x40000000, /** Combines the styles @c wxTEXT_ATTR_FONT, @c wxTEXT_ATTR_EFFECTS, @c wxTEXT_ATTR_BACKGROUND_COLOUR,