From: Robin Dunn <robin@alldunn.com>
Date: Tue, 1 Apr 2008 04:35:21 +0000 (+0000)
Subject: Don't force wxBORDER_SUNKEN so the programmer can specify some other style.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/008e999e14d300a37c25dd67b7b8d9dbbd00489f

Don't force wxBORDER_SUNKEN so the programmer can specify some other style.

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

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index b509ac317d..d23b3c54ee 100644
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -3851,8 +3851,11 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
            const wxPoint& pos, const wxSize& size,
            long style, const wxValidator& validator )
 {
+    if ( (style & wxBORDER_MASK) == 0)
+        style |= wxBORDER_SUNKEN;
+    
     if (!wxControl::Create( parent, id, pos, size,
-                            style | wxScrolledWindowStyle|wxBORDER_SUNKEN, validator))
+                            style | wxScrolledWindowStyle, validator))
         return false;
 
     SetInitialSize(size);