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

Warn on incompatible wxDirDialog styles

Browse Source
This commit is contained in:
Ian McInerney
2020-06-02 10:36:53 +01:00
committed by Vadim Zeitlin
parent 7230acd110
commit ade5030c56
4 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/wx/dirdlg.h
View File

@@ -88,7 +88,12 @@ public:
virtual void SetPath(const wxString& path) { m_path = path; }
virtual wxString GetMessage() const { return m_message; }
virtual wxString GetPath() const { return m_path; }
virtual wxString GetPath() const
{
wxCHECK_MSG( !HasFlag(wxDD_MULTIPLE), wxString(), "When using wxDD_MULTIPLE, must call GetPaths() instead" );
return m_path;
}
virtual void GetPaths(wxArrayString& paths) const { paths.Empty(); paths.Add(m_path); }
protected:

3
interface/wx/dirdlg.h
View File

@@ -122,6 +122,9 @@ public:
/**
Returns the default or user-selected path.
@note This function can't be used with dialogs which have the @c wxDD_MULTIPLE style,
use GetPaths() instead.
*/
virtual wxString GetPath() const;

1
src/gtk/dirdlg.cpp
View File

@@ -190,6 +190,7 @@ void wxDirDialog::SetPath(const wxString& dir)
wxString wxDirDialog::GetPath() const
{
wxCHECK_MSG( !HasFlag(wxDD_MULTIPLE), wxString(), "When using wxDD_MULTIPLE, must call GetPaths() instead" );
return m_paths.Last();
}

1
src/osx/cocoa/dirdlg.mm
View File

@@ -173,6 +173,7 @@ void wxDirDialog::SetTitle(const wxString &title)
wxString wxDirDialog::GetPath() const
{
wxCHECK_MSG( !HasFlag(wxDD_MULTIPLE), wxString(), "When using wxDD_MULTIPLE, must call GetPaths() instead" );
return m_paths.Last();
}