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

Fix wxDataViewRenderer::GetEllipsizeMode() for kDataBrowserTruncateTextMiddle.

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2009-11-16 15:03:39 +00:00
parent 200c18cc6c
commit c32eeaccc3
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/osx/carbon/dataview.cpp
View File

@@ -2283,14 +2283,11 @@ wxEllipsizeMode wxDataViewRenderer::GetEllipsizeMode() const
return wxELLIPSIZE_NONE; return wxELLIPSIZE_NONE;
if ( flags & kDataBrowserTruncateTextAtStart ) if ( flags & kDataBrowserTruncateTextAtStart )
return wxELLIPSIZE_START; return wxELLIPSIZE_START;
if ( flags & kDataBrowserTruncateTextMiddle )
return wxELLIPSIZE_MIDDLE;
if ( flags & kDataBrowserTruncateTextAtEnd ) if ( flags & kDataBrowserTruncateTextAtEnd )
return wxELLIPSIZE_END; return wxELLIPSIZE_END;
wxFAIL_MSG( "unknown flags" ); // kDataBrowserTruncateTextMiddle == 0 so there is no need to test for it
return wxELLIPSIZE_MIDDLE;
return wxELLIPSIZE_NONE;
} }
void wxDataViewRenderer::SetNativeData(wxDataViewRendererNativeData* newNativeDataPtr) void wxDataViewRenderer::SetNativeData(wxDataViewRendererNativeData* newNativeDataPtr)