From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Wed, 28 Jul 2004 13:51:03 +0000 (+0000)
Subject: HasFlag is not set at this point
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/9c4e5c709e53aa5508930a3b363326625bdf99b3?hp=441b46ac5e09a531b4a64180fa6ec9f4777d23a0

HasFlag is not set at this point


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

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index d62754276b..8f28ec3dcc 100644
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -354,8 +354,8 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
     m_macIsUserPane = FALSE ;
     m_editable = true ;
 
-    if ( !HasFlag(wxNO_BORDER) )
-        style |= wxSUNKEN_BORDER ;
+    if ( ! ( style & wxNO_BORDER) )
+        style = ( style & ~wxBORDER_MASK) | wxSUNKEN_BORDER ;
     
     if ( !wxTextCtrlBase::Create(parent, id, pos, size, style & ~(wxHSCROLL|wxVSCROLL), validator, name) )
         return FALSE;