From: Włodzimierz Skiba Date: Tue, 18 May 2004 13:04:41 +0000 (+0000) Subject: Patch #953165, Bug #821657: wxHIDE_READONLY no more important. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/21416306cb462782b3421ff483a88813c130dfb0?ds=inline Patch #953165, Bug #821657: wxHIDE_READONLY no more important. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27337 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h index afcffa03b8..23eccc3bc7 100644 --- a/include/wx/filedlg.h +++ b/include/wx/filedlg.h @@ -30,7 +30,9 @@ enum wxOPEN = 0x0001, wxSAVE = 0x0002, wxOVERWRITE_PROMPT = 0x0004, +#if WXWIN_COMPATIBILITY_2_4 wxHIDE_READONLY = 0x0008, +#endif wxFILE_MUST_EXIST = 0x0010, wxMULTIPLE = 0x0020, wxCHANGE_DIR = 0x0040 diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp index 7888780761..775affb082 100644 --- a/src/msw/filedlg.cpp +++ b/src/msw/filedlg.cpp @@ -139,9 +139,14 @@ int wxFileDialog::ShowModal() *fileNameBuffer = wxT('\0'); *titleBuffer = wxT('\0'); +#if WXWIN_COMPATIBILITY_2_4 long msw_flags = 0; if ( (m_dialogStyle & wxHIDE_READONLY) || (m_dialogStyle & wxSAVE) ) msw_flags |= OFN_HIDEREADONLY; +#else + long msw_flags = OFN_HIDEREADONLY; +#endif + if ( m_dialogStyle & wxFILE_MUST_EXIST ) msw_flags |= OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST;