From: Julian Smart <julian@anthemion.co.uk>
Date: Fri, 25 Jan 2008 09:15:26 +0000 (+0000)
Subject: Fixed a bug in HasAlignment
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/6470ffba4547f8db5faa316553049d09f0c4e0b4

Fixed a bug in HasAlignment


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51367 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h
index 8c1dc3cf64..93160e3fed 100644
--- a/include/wx/textctrl.h
+++ b/include/wx/textctrl.h
@@ -360,7 +360,7 @@ public:
     // accessors
     bool HasTextColour() const { return m_colText.Ok() && HasFlag(wxTEXT_ATTR_TEXT_COLOUR) ; }
     bool HasBackgroundColour() const { return m_colBack.Ok() && HasFlag(wxTEXT_ATTR_BACKGROUND_COLOUR) ; }
-    bool HasAlignment() const { return (m_textAlignment != wxTEXT_ALIGNMENT_DEFAULT) || HasFlag(wxTEXT_ATTR_ALIGNMENT) ; }
+    bool HasAlignment() const { return (m_textAlignment != wxTEXT_ALIGNMENT_DEFAULT) && HasFlag(wxTEXT_ATTR_ALIGNMENT) ; }
     bool HasTabs() const { return HasFlag(wxTEXT_ATTR_TABS) ; }
     bool HasLeftIndent() const { return HasFlag(wxTEXT_ATTR_LEFT_INDENT); }
     bool HasRightIndent() const { return HasFlag(wxTEXT_ATTR_RIGHT_INDENT); }