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

Remove wxFileDialog related symbols already present since Win2k

Browse Source 
<https://msdn.microsoft.com/en-us/library/ms646839(vs.85).aspx>
This commit is contained in:
Catalin 2017-03-05 02:05:32 +02:00
parent 52130e43ab
commit 3b97482dbc
1 changed files with 6 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
src/msw/filedlg.cpp
View File

@ -370,63 +370,11 @@ static bool DoShowCommFileDialog(OPENFILENAME *of, long style, DWORD *err)
return false;
}
// We want to use OPENFILENAME struct version 5 (Windows 2000/XP) but we don't
// know if the OPENFILENAME declared in the currently used headers is a V5 or
// V4 (smaller) one so we try to manually extend the struct in case it is the
// old one.
//
// We don't do this under Win64, however, as there are no
// compilers with old headers for these architectures
#if defined(__WIN64__)
typedef OPENFILENAME wxOPENFILENAME;
static const DWORD gs_ofStructSize = sizeof(OPENFILENAME);
#else // __WIN64__
#define wxTRY_SMALLER_OPENFILENAME
struct wxOPENFILENAME : public OPENFILENAME
{
// fields added in Windows 2000/XP comdlg32.dll version
void *pVoid;
DWORD dw1;
DWORD dw2;
};
// hardcoded sizeof(OPENFILENAME) in the Platform SDK: we have to do it
// because sizeof(OPENFILENAME) in the headers we use when compiling the
// library could be less if _WIN32_WINNT is not >= 0x500
static const DWORD wxOPENFILENAME_V5_SIZE = 88;
// this is hardcoded sizeof(OPENFILENAME_NT4) from Platform SDK
static const DWORD wxOPENFILENAME_V4_SIZE = 76;
// always try the new one first
static DWORD gs_ofStructSize = wxOPENFILENAME_V5_SIZE;
#endif // __WIN64__/!...
static bool ShowCommFileDialog(OPENFILENAME *of, long style)
{
DWORD errCode;
bool success = DoShowCommFileDialog(of, style, &errCode);
#ifdef wxTRY_SMALLER_OPENFILENAME
// the system might be too old to support the new version file dialog
// boxes, try with the old size
if ( !success && errCode == CDERR_STRUCTSIZE &&
of->lStructSize != wxOPENFILENAME_V4_SIZE )
{
of->lStructSize = wxOPENFILENAME_V4_SIZE;
success = DoShowCommFileDialog(of, style, &errCode);
if ( success || !errCode )
{
// use this struct size for subsequent dialogs
gs_ofStructSize = of->lStructSize;
}
}
#endif // wxTRY_SMALLER_OPENFILENAME
if ( !success &&
errCode == FNERR_INVALIDFILENAME &&
of->lpstrFile[0] )
@ -517,10 +465,10 @@ int wxFileDialog::ShowModal()
msw_flags |= OFN_OVERWRITEPROMPT;
}
wxOPENFILENAME of;
OPENFILENAME of;
wxZeroMemory(of);
of.lStructSize = gs_ofStructSize;
of.lStructSize = sizeof(OPENFILENAME);
of.hwndOwner = hWndParent;
of.lpstrTitle = m_message.t_str();
of.lpstrFileTitle = titleBuffer;
@ -666,11 +614,10 @@ int wxFileDialog::ShowModal()
}
} cwdOrig;
// GetOpenFileName will always change the current working directory on
// (according to MSDN) "Windows NT 4.0/2000/XP" because the flag
// OFN_NOCHANGEDIR has no effect. If the user did not specify
// wxFD_CHANGE_DIR let's restore the current working directory to what it
// was before the dialog was shown.
// GetOpenFileName will always change the current working directory
// (according to MSDN) because the flag OFN_NOCHANGEDIR has no effect.
// If the user did not specify wxFD_CHANGE_DIR let's restore the
// current working directory to what it was before the dialog was shown.
if (msw_flags & OFN_NOCHANGEDIR)
cwdOrig.value = wxGetCwd();
@ -682,14 +629,9 @@ int wxFileDialog::ShowModal()
m_fileNames.Empty();
if ( ( HasFdFlag(wxFD_MULTIPLE) ) &&
#if defined(OFN_EXPLORER)
( fileNameBuffer[of.nFileOffset-1] == wxT('\0') )
#else
( fileNameBuffer[of.nFileOffset-1] == wxT(' ') )
#endif // OFN_EXPLORER
)
{
#if defined(OFN_EXPLORER)
m_dir = fileNameBuffer;
i = of.nFileOffset;
m_fileName = &fileNameBuffer[i];
@ -701,15 +643,6 @@ int wxFileDialog::ShowModal()
m_fileNames.Add(&fileNameBuffer[i]);
i += wxStrlen(&fileNameBuffer[i]) + 1;
}
#else
wxStringTokenizer toke(fileNameBuffer, wxT(" \t\r\n"));
m_dir = toke.GetNextToken();
m_fileName = toke.GetNextToken();
m_fileNames.Add(m_fileName);
while (toke.HasMoreTokens())
m_fileNames.Add(toke.GetNextToken());
#endif // OFN_EXPLORER
m_path = m_dir;
if ( m_dir.Last() != wxT('\\') )