Fix regression in wxGTK wxFilePickerCtrl due to wxFileDialog changes.
Revert the changes of r72979 and fix wxFileDialog::GetDirectory() return value bug (see #14786) differently to avoid breaking wxFilePickerCtrl which relies on getting wxEVT_BUTTON event when the associated dialog is dismissed. Closes #15218. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74043 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -43,7 +43,6 @@ public:
|
||||
|
||||
virtual wxString GetPath() const;
|
||||
virtual void GetPaths(wxArrayString& paths) const;
|
||||
virtual wxString GetDirectory() const;
|
||||
virtual wxString GetFilename() const;
|
||||
virtual void GetFilenames(wxArrayString& files) const;
|
||||
virtual int GetFilterIndex() const;
|
||||
@@ -59,9 +58,6 @@ public:
|
||||
|
||||
virtual bool SupportsExtraControl() const { return true; }
|
||||
|
||||
// Implementation only.
|
||||
void GTKOnAccept();
|
||||
void GTKOnCancel();
|
||||
|
||||
protected:
|
||||
// override this from wxTLW since the native
|
||||
@@ -72,10 +68,10 @@ protected:
|
||||
|
||||
|
||||
private:
|
||||
void OnFakeOk( wxCommandEvent &event );
|
||||
void OnSize(wxSizeEvent&);
|
||||
virtual void AddChildGTK(wxWindowGTK* child);
|
||||
|
||||
wxString m_selectedDirectory;
|
||||
wxGtkFileChooser m_fc;
|
||||
|
||||
DECLARE_DYNAMIC_CLASS(wxFileDialog)
|
||||
|
Reference in New Issue
Block a user