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 b509ac317da70849186de63b26fbfacb5ab8f335..d23b3c54ee00f3f62b7096304cf751f6c829087d 100644 (file)
--- 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 )
 {
            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,
     if (!wxControl::Create( parent, id, pos, size,

-                            style | wxScrolledWindowStyle|wxBORDER_SUNKEN, validator))
+                            style | wxScrolledWindowStyle, validator))

         return false;
 
     SetInitialSize(size);
         return false;
 
     SetInitialSize(size);