From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 7 Mar 2009 14:37:53 +0000 (+0000)
Subject: store our styles in wxSpinCtrlGenericBase ctor (needed to make the changes of r59410... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/18e45a88f68d66e1980e0bda8817dd3fb4f18c18

store our styles in wxSpinCtrlGenericBase ctor (needed to make the changes of r59410 actually work, see #10557)

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

diff --git a/src/generic/spinctlg.cpp b/src/generic/spinctlg.cpp
index 8be2e5d720..70a58db535 100644
--- a/src/generic/spinctlg.cpp
+++ b/src/generic/spinctlg.cpp
@@ -186,7 +186,8 @@ bool wxSpinCtrlGenericBase::Create(wxWindow *parent,
     // the text control borders (but we might want to use style border bits to
     // select the text control style)
     if ( !wxControl::Create(parent, id, wxDefaultPosition, wxDefaultSize,
-                            wxBORDER_NONE, wxDefaultValidator, name) )
+                            (style & ~wxBORDER_MASK) | wxBORDER_NONE,
+                            wxDefaultValidator, name) )
     {
         return false;
     }