From f938402dd085d323482c32600f6af98d2c5189e9 Mon Sep 17 00:00:00 2001
From: Artur Wieczorek <artwik@wp.pl>
Date: Fri, 1 May 2020 19:38:52 +0200
Subject: [PATCH] Use conditional operator instead of conditional statement

---
 src/propgrid/property.cpp | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/propgrid/property.cpp b/src/propgrid/property.cpp
index 763042fefd..6b6f76e66d 100644
--- 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() )
     {