{
m_bypassGenericImpl = bypassGenericImpl;
+ parent = GetParentForModalDialog(parent);
+
if (!wxFileDialogBase::Create(parent, message, defaultDir, defaultFile,
wildCard, style, pos, sz, name))
{
return true;
if (!wxDialog::Create( parent, wxID_ANY, message, pos, sz,
- wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER, name
+ wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | style, name
))
{
return false;
ignoreChanges = true;
+#if wxUSE_CONFIG
if (wxConfig::Get(false))
{
wxConfig::Get()->Read(wxT("/wxWindows/wxFileDialog/ViewStyle"),
wxConfig::Get()->Read(wxT("/wxWindows/wxFileDialog/ShowHidden"),
&ms_lastShowHidden);
}
+#endif
if ((m_dir.empty()) || (m_dir == wxT(".")))
{
mainsizer->Add( staticsizer, 0, wxEXPAND | wxLEFT|wxRIGHT|wxBOTTOM, 10 );
long style2 = ms_lastViewStyle;
- if ( style & wxFD_MULTIPLE == 0 )
+ if ( !HasFdFlag(wxFD_MULTIPLE) )
style2 |= wxLC_SINGLE_SEL;
#ifdef __WXWINCE__
if (!m_bypassGenericImpl)
{
+#if wxUSE_CONFIG
if (wxConfig::Get(false))
{
wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ViewStyle"),
wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ShowHidden"),
ms_lastShowHidden);
}
+#endif
const int count = m_choice->GetCount();
for ( int i = 0; i < count; i++ )
}
#endif // __UNIX__
- if (!HasFlag(wxFD_SAVE))
+ if (!HasFdFlag(wxFD_SAVE))
{
if ((filename.Find(wxT('*')) != wxNOT_FOUND) ||
(filename.Find(wxT('?')) != wxNOT_FOUND))
// VZ: the logic of testing for !wxFileExists() only for the open file
// dialog is not entirely clear to me, why don't we allow saving to a
// file without extension as well?
- if ( !HasFlag(wxFD_OPEN) || !wxFileExists(filename) )
+ if ( !HasFdFlag(wxFD_OPEN) || !wxFileExists(filename) )
{
filename = AppendExtension(filename, m_filterExtension);
}
// check that the file [doesn't] exist if necessary
- if ( HasFlag(wxFD_SAVE) && HasFlag(wxFD_OVERWRITE_PROMPT) &&
+ if ( HasFdFlag(wxFD_SAVE) && HasFdFlag(wxFD_OVERWRITE_PROMPT) &&
wxFileExists( filename ) )
{
wxString msg;
if (wxMessageBox(msg, _("Confirm"), wxYES_NO) != wxYES)
return;
}
- else if ( HasFlag(wxFD_OPEN) && HasFlag(wxFD_FILE_MUST_EXIST) &&
+ else if ( HasFdFlag(wxFD_OPEN) && HasFdFlag(wxFD_FILE_MUST_EXIST) &&
!wxFileExists(filename) )
{
wxMessageBox(_("Please choose an existing file."), _("Error"),
wxOK | wxICON_ERROR );
+
+ return;
}
SetPath( filename );
// change to the directory where the user went if asked
- if ( HasFlag(wxFD_CHANGE_DIR) )
+ if ( HasFdFlag(wxFD_CHANGE_DIR) )
{
wxString cwd;
wxSplitPath(filename, &cwd, NULL, NULL);
#endif // defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)
}
-#ifdef wxUSE_GENERIC_FILEDIALOG
+#ifdef wxHAS_GENERIC_FILEDIALOG
IMPLEMENT_DYNAMIC_CLASS(wxFileDialog, wxGenericFileDialog)
-#endif // wxUSE_GENERIC_FILEDIALOG
+#endif // wxHAS_GENERIC_FILEDIALOG
#endif // wxUSE_FILEDLG