X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2482282d479efe2a77d816a7d667f35add4f0958..5e3062291922189a215b81a0ae4fc4022ace597b:/src/common/dlgcmn.cpp?ds=sidebyside diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp index 2f1cac5f56..0ba3bc7d33 100644 --- a/src/common/dlgcmn.cpp +++ b/src/common/dlgcmn.cpp @@ -116,12 +116,13 @@ wxWindow *wxDialogBase::CheckIfCanBeUsedAsParent(wxWindow *parent) const return parent; } -wxWindow *wxDialogBase::GetParentForModalDialog(wxWindow *parent) const +wxWindow * +wxDialogBase::GetParentForModalDialog(wxWindow *parent, long style) const { // creating a parent-less modal dialog will result (under e.g. wxGTK2) // in an unfocused dialog, so try to find a valid parent for it unless we // were explicitly asked not to - if ( HasFlag(wxDIALOG_NO_PARENT) ) + if ( style & wxDIALOG_NO_PARENT ) return NULL; // first try the given parent @@ -480,7 +481,7 @@ void wxDialogBase::ShowWindowModal () void wxDialogBase::SendWindowModalDialogEvent ( wxEventType type ) { - wxCommandEvent event ( type, GetId()); + wxWindowModalDialogEvent event ( type, GetId()); event.SetEventObject(this); if ( !GetEventHandler()->ProcessEvent(event) )