Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pass proper argument to wxFileDialog

Browse Source 
File name only should be passed for `defaultFile' parameter otherwise
assertion in wxFileName::Assign() fails ("the file name shouldn't
contain the path").
This commit is contained in:
Artur Wieczorek
2020-04-17 23:18:06 +02:00
parent 5236801241
commit fbafe74414
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/propgrid/props.cpp
View File

@@ -2191,9 +2191,9 @@ bool wxFileProperty::DisplayEditorDialog(wxPropertyGrid* pg, wxVariant& value)
{ {
wxASSERT_MSG(value.IsType(wxS("string")), "Function called for incompatible property"); wxASSERT_MSG(value.IsType(wxS("string")), "Function called for incompatible property");
wxString strVal = value.GetString(); wxFileName filename(value.GetString());
wxFileName filename = strVal;
wxString path = filename.GetPath(); wxString path = filename.GetPath();
wxString file = filename.GetFullName();
if ( path.empty() && !m_basePath.empty() ) if ( path.empty() && !m_basePath.empty() )
path = m_basePath; path = m_basePath;
@@ -2201,7 +2201,7 @@ bool wxFileProperty::DisplayEditorDialog(wxPropertyGrid* pg, wxVariant& value)
wxFileDialog dlg(pg->GetPanel(), wxFileDialog dlg(pg->GetPanel(),
m_dlgTitle.empty() ? _("Choose a file") : m_dlgTitle, m_dlgTitle.empty() ? _("Choose a file") : m_dlgTitle,
m_initialPath.empty() ? path : m_initialPath, m_initialPath.empty() ? path : m_initialPath,
strVal, file,
m_wildcard.empty() ? wxALL_FILES : m_wildcard, m_wildcard.empty() ? wxALL_FILES : m_wildcard,
m_dlgStyle, m_dlgStyle,
wxDefaultPosition); wxDefaultPosition);