From 3fdf86f91e81de1fa33b74a8cdda8b70b706c6ef Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Thu, 22 Jan 2009 13:33:00 +0000 Subject: [PATCH] Override GetDefaultBorder, currently changes nothing git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58292 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/generic/dataview.h | 2 ++ src/generic/datavgen.cpp | 9 +++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/include/wx/generic/dataview.h b/include/wx/generic/dataview.h index a4780c42ab..bc5abbd92e 100644 --- a/include/wx/generic/dataview.h +++ b/include/wx/generic/dataview.h @@ -453,6 +453,8 @@ public: virtual bool EnableDragSource( const wxDataFormat &format ); virtual bool EnableDropTarget( const wxDataFormat &format ); + virtual wxBorder GetDefaultBorder() const; + protected: virtual int GetSelections( wxArrayInt & sel ) const; virtual void SetSelections( const wxArrayInt & sel ); diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp index e00d3b813a..7079649cc6 100644 --- a/src/generic/datavgen.cpp +++ b/src/generic/datavgen.cpp @@ -3691,8 +3691,8 @@ 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 ( (style & wxBORDER_MASK) == 0) +// style |= wxBORDER_SUNKEN; Init(); @@ -3724,6 +3724,11 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, return true; } +wxBorder wxDataViewCtrl::GetDefaultBorder() const +{ + return wxBORDER_THEME; +} + #ifdef __WXMSW__ WXLRESULT wxDataViewCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, -- 2.45.2