WPARAM WXUNUSED(wParam),
LPARAM lParam)
{
- HWND hwndDialog;
- hwndDialog = ::GetParent( hDlg );
- switch (iMsg)
+ switch ( iMsg )
{
- case WM_DESTROY:
- {
- RECT dlgRect;
- GetWindowRect( hwndDialog, & dlgRect );
- gs_rectDialog.x = dlgRect.left;
- gs_rectDialog.y = dlgRect.top;
- gs_rectDialog.width = dlgRect.right - dlgRect.left;
- gs_rectDialog.height = dlgRect.bottom - dlgRect.top;
- }
- break;
-
case WM_NOTIFY:
{
- OFNOTIFY * pNotifyCode;
- pNotifyCode = (LPOFNOTIFY) lParam;
- if (CDN_INITDONE == (pNotifyCode->hdr).code)
+ OFNOTIFY *pNotifyCode = wx_reinterpret_cast(OFNOTIFY *, lParam);
+ if ( pNotifyCode->hdr.code == CDN_INITDONE )
{
- SetWindowPos( hwndDialog, HWND_TOP,
- gs_rectDialog.x,
- gs_rectDialog.y,
- gs_rectDialog.width,
- gs_rectDialog.height,
- SWP_NOZORDER|SWP_NOSIZE);
+ // note that we need to move the parent window: hDlg is a
+ // child of it when OFN_EXPLORER is used
+ ::SetWindowPos
+ (
+ ::GetParent(hDlg),
+ HWND_TOP,
+ gs_rectDialog.x, gs_rectDialog.y,
+ 0, 0,
+ SWP_NOZORDER | SWP_NOSIZE
+ );
}
}
break;
+
+ case WM_DESTROY:
+ // reuse the position used for the dialog the next time by default
+ //
+ // NB: at least under Windows 2003 this is useless as after the
+ // first time it's shown the dialog always remembers its size
+ // and position itself and ignores any later SetWindowPos calls
+ wxCopyRECTToRect(wxGetWindowRect(::GetParent(hDlg)), gs_rectDialog);
+ break;
}
// do the default processing
const wxString& defaultFileName,
const wxString& wildCard,
long style,
- const wxPoint& pos)
+ const wxPoint& pos,
+ const wxSize& sz,
+ const wxString& name)
: wxFileDialogBase(parent, message, defaultDir, defaultFileName,
- wildCard, style, pos)
+ wildCard, style, pos, sz, name)
{
- if ( ( m_dialogStyle & wxMULTIPLE ) && ( m_dialogStyle & wxSAVE ) )
- m_dialogStyle &= ~wxMULTIPLE;
+ // NB: all style checks are done by wxFileDialogBase::Create
m_bMovedWindow = false;
m_fileName << _T('.') << ext;
}
-void wxFileDialog::DoGetPosition( int *x, int *y ) const
+void wxFileDialog::DoGetPosition(int *x, int *y) const
{
- *x = gs_rectDialog.x;
- *y = gs_rectDialog.y;
+ if ( x )
+ *x = gs_rectDialog.x;
+ if ( y )
+ *y = gs_rectDialog.y;
}
void wxFileDialog::DoGetSize(int *width, int *height) const
{
- *width = gs_rectDialog.width;
- *height = gs_rectDialog.height;
+ if ( width )
+ *width = gs_rectDialog.width;
+ if ( height )
+ *height = gs_rectDialog.height;
}
-void wxFileDialog::DoMoveWindow(int x, int y, int WXUNUSED(width), int WXUNUSED(height))
+void wxFileDialog::DoMoveWindow(int x, int y, int WXUNUSED(w), int WXUNUSED(h))
{
m_bMovedWindow = true;
gs_rectDialog.x = x;
gs_rectDialog.y = y;
- /*
- The width and height can not be set by the programmer
- its just not possible. But the program can get the
- size of the Dlg after it has been shown, in case they need
- that data.
- */
+ // size of the dialog can't be changed because the controls are not laid
+ // out correctly then
}
// helper used below in ShowModal(): style is used to determine whether to show
-// the "Save file" dialog (if it contains wxSAVE bit) or "Open file" one;
+// the "Save file" dialog (if it contains wxFD_SAVE bit) or "Open file" one;
// returns true on success or false on failure in which case err is filled with
// the CDERR_XXX constant
static bool DoShowCommFileDialog(OPENFILENAME *of, long style, DWORD *err)
{
- if ( style & wxSAVE ? GetSaveFileName(of) : GetOpenFileName(of) )
+ if ( style & wxFD_SAVE ? GetSaveFileName(of) : GetOpenFileName(of) )
return true;
if ( err )
return false;
}
-// Basically, the problem is that we need to use the "new" size of the
-// OPENFILENAME structure
-// (OPENFILENAME_SIZE_VERSION_400 + void* + DWORD + DWORD)
-// in Windows 2000 and XP so that the new-style file dialog with the
-// "Places Bar" shows up. Unfortunately, there seems to be no reliable way
-// to test for it in the headers, so we need to always make one
-// with the extra bytes.
+// 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 on Windows CE, however.
-#ifdef __WXWINCE__
+// We don't do this on Windows CE nor under Win64, however, as there are no
+// compilers with old headers for these architectures
+#if defined(__WXWINCE__) || defined(__WIN64__)
typedef OPENFILENAME wxOPENFILENAME;
- static const DWORD wxOPENFILENAME_V5_SIZE = sizeof(OPENFILENAME);
-#else // !__WXWINCE__
+ static const DWORD gs_ofStructSize = sizeof(OPENFILENAME);
+#else // !__WXWINCE__ || __WIN64__
+ #define wxTRY_SMALLER_OPENFILENAME
+
struct wxOPENFILENAME : public OPENFILENAME
{
// fields added in Windows 2000/XP comdlg32.dll version
// this is hardcoded sizeof(OPENFILENAME_NT4) from Platform SDK
static const DWORD wxOPENFILENAME_V4_SIZE = 76;
-#endif // __WXWINCE__/!__WXWINCE__
-// always try the new one first
-static DWORD gs_ofStructSize = wxOPENFILENAME_V5_SIZE;
+ // always try the new one first
+ static DWORD gs_ofStructSize = wxOPENFILENAME_V5_SIZE;
+#endif // __WXWINCE__ || __WIN64__/!...
int wxFileDialog::ShowModal()
{
#if WXWIN_COMPATIBILITY_2_4
long msw_flags = 0;
- if ( (m_dialogStyle & wxHIDE_READONLY) || (m_dialogStyle & wxSAVE) )
+ if ( (m_windowStyle & wxHIDE_READONLY) || (m_windowStyle & wxFD_SAVE) )
msw_flags |= OFN_HIDEREADONLY;
#else
long msw_flags = OFN_HIDEREADONLY;
#endif
- if ( m_dialogStyle & wxFILE_MUST_EXIST )
+ if ( m_windowStyle & wxFD_FILE_MUST_EXIST )
msw_flags |= OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST;
/*
If the window has been moved the programmer is probably
#endif
}
- if (m_dialogStyle & wxMULTIPLE )
+ if (m_windowStyle & wxFD_MULTIPLE )
{
// OFN_EXPLORER must always be specified with OFN_ALLOWMULTISELECT
msw_flags |= OFN_EXPLORER | OFN_ALLOWMULTISELECT;
}
- // if wxCHANGE_DIR flag is not given we shouldn't change the CWD which the
+ // if wxFD_CHANGE_DIR flag is not given we shouldn't change the CWD which the
// standard dialog does by default (notice that under NT it does it anyhow,
// OFN_NOCHANGEDIR or not, see below)
- if ( !(m_dialogStyle & wxCHANGE_DIR) )
+ if ( !(m_windowStyle & wxFD_CHANGE_DIR) )
{
msw_flags |= OFN_NOCHANGEDIR;
}
- if ( m_dialogStyle & wxOVERWRITE_PROMPT )
+ if ( m_windowStyle & wxFD_OVERWRITE_PROMPT )
{
msw_flags |= OFN_OVERWRITEPROMPT;
}
}
// Replace | with \0
- for (i = 0; i < filterBuffer.Len(); i++ ) {
+ for (i = 0; i < filterBuffer.length(); i++ ) {
if ( filterBuffer.GetChar(i) == wxT('|') ) {
filterBuffer[i] = wxT('\0');
}
of.nMaxFile = wxMAXPATH;
// we must set the default extension because otherwise Windows would check
- // for the existing of a wrong file with wxOVERWRITE_PROMPT (i.e. if the
+ // for the existing of a wrong file with wxFD_OVERWRITE_PROMPT (i.e. if the
// user types "foo" and the default extension is ".bar" we should force it
// to check for "foo.bar" existence and not "foo")
wxString defextBuffer; // we need it to be alive until GetSaveFileName()!
- if (m_dialogStyle & wxSAVE)
+ if (m_windowStyle & wxFD_SAVE)
{
const wxChar* extension = filterBuffer;
int maxFilter = (int)(of.nFilterIndex*2L) - 1;
//== Execute FileDialog >>=================================================
DWORD errCode;
- bool success = DoShowCommFileDialog(&of, m_dialogStyle, &errCode);
+ bool success = DoShowCommFileDialog(&of, m_windowStyle, &errCode);
-#ifndef __WXWINCE__
+#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;
- success = DoShowCommFileDialog(&of, m_dialogStyle, &errCode);
+ success = DoShowCommFileDialog(&of, m_windowStyle, &errCode);
if ( success || !errCode )
{
gs_ofStructSize = of.lStructSize;
}
}
-#endif // !__WXWINCE__
+#endif // wxTRY_SMALLER_OPENFILENAME
if ( success )
{
// 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
- // wxCHANGE_DIR let's restore the current working directory to what it
+ // wxFD_CHANGE_DIR let's restore the current working directory to what it
// was before the dialog was shown.
if ( msw_flags & OFN_NOCHANGEDIR )
{
m_fileNames.Empty();
- if ( ( m_dialogStyle & wxMULTIPLE ) &&
+ if ( ( m_windowStyle & wxFD_MULTIPLE ) &&
#if defined(OFN_EXPLORER)
( fileNameBuffer[of.nFileOffset-1] == wxT('\0') )
#else
i = of.nFileOffset;
m_fileName = &fileNameBuffer[i];
m_fileNames.Add(m_fileName);
- i += m_fileName.Len() + 1;
+ i += m_fileName.length() + 1;
while (fileNameBuffer[i] != wxT('\0'))
{
extension = extension + wxStrlen( extension ) + 1;
m_fileName = AppendExtension(fileNameBuffer, extension);
- wxStrncpy(fileNameBuffer, m_fileName.c_str(), wxMin(m_fileName.Len(), wxMAXPATH-1));
- fileNameBuffer[wxMin(m_fileName.Len(), wxMAXPATH-1)] = wxT('\0');
+ wxStrncpy(fileNameBuffer, m_fileName.c_str(), wxMin(m_fileName.length(), wxMAXPATH-1));
+ fileNameBuffer[wxMin(m_fileName.length(), wxMAXPATH-1)] = wxT('\0');
}
m_path = fileNameBuffer;
}
#endif // wxUSE_FILEDLG && !(__SMARTPHONE__ && __WXWINCE__)
-
projects / wxWidgets.git / blobdiff