2006 version of Borland compiler still doesn't grok operator?: involving wxStrings

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56464 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/propgrid/props.cpp b/src/propgrid/props.cpp
index 5c497fef72d2c09161334e92c9e61fc44c1a87f4..a182229cc9f031ccf2dbec4fecb4d0fb8965b78e 100644 (file)
--- a/src/propgrid/props.cpp
+++ b/src/propgrid/props.cpp
@@ -1569,17 +1569,21 @@ bool wxDirProperty::OnButtonClick( wxPropertyGrid* propGrid, wxString& value )
     // Update property value from editor, if necessary
     wxSize dlg_sz(300,400);
 
+    wxString dlgMessage(m_dlgMessage);
+    if ( dlgMessage.empty() )
+        dlgMessage = _("Choose a directory:");
     wxDirDialog dlg( propGrid,
-                     m_dlgMessage.length() ? m_dlgMessage : wxString(_("Choose a directory:")),
+                     dlgMessage,
                      value,
                      0,
 #if !wxPG_SMALL_SCREEN
                      propGrid->GetGoodEditorDialogPosition(this,dlg_sz),
-                     dlg_sz );
+                     dlg_sz
 #else
                      wxDefaultPosition,
-                     wxDefaultSize );
+                     wxDefaultSize
 #endif
+                    );
 
     if ( dlg.ShowModal() == wxID_OK )
     {