Use conditional operator instead of conditional statement

2020-05-01 19:38:52 +02:00
parent c0f7275b11
commit f938402dd0
1 changed files with 1 additions and 9 deletions
--- a/src/propgrid/property.cpp
+++ b/src/propgrid/property.cpp
@@ -2123,16 +2123,8 @@ bool wxPGProperty::SetChoices( const wxPGChoices& choices )

 const wxPGEditor* wxPGProperty::GetEditorClass() const
 {
-    const wxPGEditor* editor;
+    const wxPGEditor* editor = m_customEditor ? m_customEditor : DoGetEditorClass();

-    if ( !m_customEditor )
-    {
-        editor = DoGetEditorClass();
-    }
-    else
-        editor = m_customEditor;
-
-    //
    // Maybe override editor if common value specified
    if ( GetDisplayedCommonValueCount() )
    {