Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build with generic wxDataViewCtrl under Mac

Browse Source 
Generic wxDataViewCheckIconTextRenderer is needed under Mac too if the
generic version of wxDVC is used.

Closes #18632.
This commit is contained in:
Vadim Zeitlin
2019-12-15 16:44:42 +01:00
parent 4203104d54
commit 24042b2a2a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/dvrenderers.h
View File

@@ -539,7 +539,7 @@ typedef wxDataViewTextRenderer wxDataViewDateRenderer;
// wxDataViewCheckIconTextRenderer: 3-state checkbox + text + optional icon // wxDataViewCheckIconTextRenderer: 3-state checkbox + text + optional icon
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#ifndef __WXOSX__ #if defined(wxHAS_GENERIC_DATAVIEWCTRL) || !defined(__WXOSX__)
class WXDLLIMPEXP_CORE wxDataViewCheckIconTextRenderer class WXDLLIMPEXP_CORE wxDataViewCheckIconTextRenderer
: public wxDataViewCustomRenderer : public wxDataViewCustomRenderer
@@ -591,7 +591,7 @@ private:
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCheckIconTextRenderer); wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCheckIconTextRenderer);
}; };
#endif // !__WXOSX__ #endif // ! native __WXOSX__
// this class is obsolete, its functionality was merged in // this class is obsolete, its functionality was merged in
// wxDataViewTextRenderer itself now, don't use it any more // wxDataViewTextRenderer itself now, don't use it any more

4
src/common/datavcmn.cpp
View File

@@ -2004,7 +2004,7 @@ wxSize wxDataViewDateRenderer::GetSize() const
// wxDataViewCheckIconTextRenderer implementation // wxDataViewCheckIconTextRenderer implementation
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#ifndef __WXOSX__ #if defined(wxHAS_GENERIC_DATAVIEWCTRL) || !defined(__WXOSX__)
IMPLEMENT_VARIANT_OBJECT_EXPORTED(wxDataViewCheckIconText, WXDLLIMPEXP_ADV) IMPLEMENT_VARIANT_OBJECT_EXPORTED(wxDataViewCheckIconText, WXDLLIMPEXP_ADV)
@@ -2196,7 +2196,7 @@ wxSize wxDataViewCheckIconTextRenderer::GetCheckSize() const
return wxRendererNative::Get().GetCheckBoxSize(GetView()); return wxRendererNative::Get().GetCheckBoxSize(GetView());
} }
#endif // !__WXOSX__ #endif // ! native __WXOSX__
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxDataViewListStore // wxDataViewListStore