From c32eeaccc3b5ad6be0baedb827b1d18aa9587a6d Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 16 Nov 2009 15:03:39 +0000 Subject: [PATCH] Fix wxDataViewRenderer::GetEllipsizeMode() for kDataBrowserTruncateTextMiddle. The value of this constant is 0 so don't test for it using operator "&", it's just the default if no others are specified. Fixes assert on startup of the dataview sample. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62665 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/osx/carbon/dataview.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/osx/carbon/dataview.cpp b/src/osx/carbon/dataview.cpp index ebac02b079..f64e35c430 100644 --- a/src/osx/carbon/dataview.cpp +++ b/src/osx/carbon/dataview.cpp @@ -2283,14 +2283,11 @@ wxEllipsizeMode wxDataViewRenderer::GetEllipsizeMode() const return wxELLIPSIZE_NONE; if ( flags & kDataBrowserTruncateTextAtStart ) return wxELLIPSIZE_START; - if ( flags & kDataBrowserTruncateTextMiddle ) - return wxELLIPSIZE_MIDDLE; if ( flags & kDataBrowserTruncateTextAtEnd ) return wxELLIPSIZE_END; - wxFAIL_MSG( "unknown flags" ); - - return wxELLIPSIZE_NONE; + // kDataBrowserTruncateTextMiddle == 0 so there is no need to test for it + return wxELLIPSIZE_MIDDLE; } void wxDataViewRenderer::SetNativeData(wxDataViewRendererNativeData* newNativeDataPtr) -- 2.45.2