diff --git a/src/propgrid/advprops.cpp b/src/propgrid/advprops.cpp
index cbcf6576c0..25154526d2 100644
--- a/src/propgrid/advprops.cpp
+++ b/src/propgrid/advprops.cpp
@@ -2170,7 +2170,7 @@ bool wxMultiChoiceProperty::OnEvent( wxPropertyGrid* propgrid,
 
         if ( dlg.ShowModal() == wxID_OK && choiceCount )
         {
-            int userStringMode = GetAttributeAsLong(wxS("UserStringMode"), 0);
+            int userStringMode = GetAttributeAsLong(wxPG_ATTR_MULTICHOICE_USERSTRINGMODE, 0);
 
             wxArrayInt arrInt = dlg.GetSelections();
 
@@ -2211,7 +2211,7 @@ bool wxMultiChoiceProperty::StringToValue( wxVariant& variant, const wxString& t
 {
     wxArrayString arr;
 
-    int userStringMode = GetAttributeAsLong(wxS("UserStringMode"), 0);
+    int userStringMode = GetAttributeAsLong(wxPG_ATTR_MULTICHOICE_USERSTRINGMODE, 0);
 
     WX_PG_TOKENIZER2_BEGIN(text,wxT('"'))
         if ( userStringMode > 0 || (m_choices.IsOk() && m_choices.Index( token ) != wxNOT_FOUND) )
diff --git a/src/propgrid/props.cpp b/src/propgrid/props.cpp
index 8957bb5d59..bc48687991 100644
--- a/src/propgrid/props.cpp
+++ b/src/propgrid/props.cpp
@@ -1966,8 +1966,8 @@ bool wxPGFileDialogAdapter::DoShowDialog( wxPropertyGrid* propGrid, wxPGProperty
     }
 
     wxFileDialog dlg( propGrid->GetPanel(),
-                      property->GetAttribute(wxS("DialogTitle"), _("Choose a file")),
-                      property->GetAttribute(wxS("InitialPath"), path),
+                      property->GetAttribute(wxPG_FILE_DIALOG_TITLE, _("Choose a file")),
+                      property->GetAttribute(wxPG_FILE_INITIAL_PATH, path),
                       wxEmptyString,
                       property->GetAttribute(wxPG_FILE_WILDCARD, wxALL_FILES),
                       property->GetAttributeAsLong(wxPG_FILE_DIALOG_STYLE, 0),