don't assert if neither wxFD_OPEN nor wxFD_SAVE is given; wxFD_OPEN is the default

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39493 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-05-31 23:37:36 +00:00
parent f36630afc9
commit 96aed0cd6b

View File

@@ -57,16 +57,16 @@ bool wxFileDialogBase::Create(wxWindow *parent,
m_windowStyle = style; m_windowStyle = style;
m_filterIndex = 0; m_filterIndex = 0;
#ifdef __WXDEBUG__ // check that the styles are not contradictory
// check the given styles wxASSERT_MSG( !(HasFlag(wxFD_SAVE) && HasFlag(wxFD_OPEN)),
wxASSERT_MSG(HasFlag(wxFD_OPEN) || HasFlag(wxFD_SAVE), wxT("You must specify one of wxFD_OPEN and wxFD_SAVE styles")); _T("can't specify both wxFD_SAVE and wxFD_OPEN at once") );
if (HasFlag(wxFD_SAVE))
wxASSERT_MSG( !HasFlag(wxFD_OPEN) && !HasFlag(wxFD_MULTIPLE) && !HasFlag(wxFD_FILE_MUST_EXIST), wxASSERT_MSG( !HasFlag(wxFD_SAVE) ||
wxT("wxFileDialog - wxFD_OPEN, wxFD_MULTIPLE or wxFD_FILE_MUST_EXIST used on a save dialog" ) ); (!HasFlag(wxFD_MULTIPLE) && !HasFlag(wxFD_FILE_MUST_EXIST)),
if (HasFlag(wxFD_OPEN)) _T("wxFD_MULTIPLE or wxFD_FILE_MUST_EXIST can't be used with wxFD_SAVE" ) );
wxASSERT_MSG( !HasFlag(wxFD_SAVE) && !HasFlag(wxFD_OVERWRITE_PROMPT),
wxT("wxFileDialog - wxFD_SAVE or wxFD_OVERWRITE_PROMPT used on a open dialog" ) ); wxASSERT_MSG( !HasFlag(wxFD_OPEN) || !HasFlag(wxFD_OVERWRITE_PROMPT),
#endif _T("wxFD_OVERWRITE_PROMPT can't be used with wxFD_OPEN") );
if ( wildCard.empty() || wildCard == wxFileSelectorDefaultWildcardStr ) if ( wildCard.empty() || wildCard == wxFileSelectorDefaultWildcardStr )
{ {