From 20430728bcbe2ade5bbdf4a3427197499ca1d913 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 15 May 2022 17:49:11 +0100 Subject: [PATCH] Add wxFileDialog::ShowCommFileDialog() No changes, just extract this function from ShowModal() before adding an alternative implementation in the upcoming commits. --- include/wx/msw/filedlg.h | 4 ++++ src/msw/filedlg.cpp | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/include/wx/msw/filedlg.h b/include/wx/msw/filedlg.h index 37a9aca01a..398641025d 100644 --- a/include/wx/msw/filedlg.h +++ b/include/wx/msw/filedlg.h @@ -55,6 +55,10 @@ protected: virtual void DoGetPosition( int *x, int *y ) const wxOVERRIDE; private: + // The real implementation of ShowModal() using traditional common dialog + // functions. + int ShowCommFileDialog(WXHWND owner); + wxArrayString m_fileNames; // remember if our SetPosition() or Centre() (which requires special diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp index 7ba7d51ff6..60636c83c3 100644 --- a/src/msw/filedlg.cpp +++ b/src/msw/filedlg.cpp @@ -405,6 +405,11 @@ int wxFileDialog::ShowModal() wxWindowDisabler disableOthers(this, parent); + return ShowCommFileDialog(hWndParent); +} + +int wxFileDialog::ShowCommFileDialog(WXHWND hWndParent) +{ static wxChar fileNameBuffer [ wxMAXPATH ]; // the file-name wxChar titleBuffer [ wxMAXFILE+1+wxMAXEXT ]; // the file-name, without path