X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8710cf5cabdb94c688f2d8d01ee83ac9b715125d..9f3362c440ef4c780d9a4bc8089de60a21d108bd:/src/generic/proplist.cpp

diff --git a/src/generic/proplist.cpp b/src/generic/proplist.cpp
index 9b32d02c00..f78601ef00 100644
--- a/src/generic/proplist.cpp
+++ b/src/generic/proplist.cpp
@@ -1465,7 +1465,7 @@ void wxFilenameListValidator::OnEdit(wxProperty *property, wxPropertyListView *v
   if (!view->GetValueText())
     return;
 
-  char *s = wxFileSelector(
+  wxString s = wxFileSelector(
      m_filenameMessage.GetData(),
      wxPathOnly(property->GetValue().StringValue()),
      wxFileNameFromPath(property->GetValue().StringValue()),
@@ -1473,9 +1473,9 @@ void wxFilenameListValidator::OnEdit(wxProperty *property, wxPropertyListView *v
      m_filenameWildCard.GetData(),
      0,
      parentWindow);
-  if (s)
+  if (s != "")
   {
-    property->GetValue() = wxString(s);
+    property->GetValue() = s;
     view->DisplayProperty(property);
     view->UpdatePropertyDisplayInList(property);
     view->OnPropertyChanged(property);
@@ -1908,7 +1908,7 @@ void wxPropertyStringListEditorDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
 
 void wxPropertyStringListEditorDialog::OnText(wxCommandEvent& event)
 {
-  if (event.GetEventType() == wxEVENT_TYPE_TEXT_ENTER_COMMAND)
+  if (event.GetEventType() == wxEVT_COMMAND_TEXT_ENTER)
   {
     SaveCurrentSelection();
   }