Return wxWindow* from wxDataViewCustomRenderer::CreateEditorCtrl().

[wxWidgets.git] / src / generic / fontdlgg.cpp

diff --git a/src/generic/fontdlgg.cpp b/src/generic/fontdlgg.cpp
index be55ed2c084dbd0c7e7e44e05422b13cf6fd5d2d..2a986588cfdfdcc6d629959ed921a758622d1917 100644 (file)
--- a/src/generic/fontdlgg.cpp
+++ b/src/generic/fontdlgg.cpp
@@ -506,10 +506,10 @@ void wxGenericFontDialog::CreateWidgets()
     if (m_colourChoice)
     {
         wxString name(wxTheColourDatabase->FindName(m_fontData.GetColour()));
-        if (name.length())
-            m_colourChoice->SetStringSelection(name);
-        else
+        if ( name.empty() )
             m_colourChoice->SetStringSelection(wxT("BLACK"));
+        else
+            m_colourChoice->SetStringSelection(name);
     }
 
     if (m_underLineCheckBox)