From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 20 Oct 2008 10:31:29 +0000 (+0000)
Subject: 2006 version of Borland compiler still doesn't grok operator?: involving wxStrings
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/bd8b65be3d23b530c85b01b124540db8bdedc1b7?ds=inline

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 5c497fef72..a182229cc9 100644
--- 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 )
     {