X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d1b5dd559600a58350edd30b0762e6573b1b47a1..9ac34ac9156ea40ad76025aedb6eef86b2a813cc:/src/common/dlgcmn.cpp

diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp
index b0aa664380..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
@@ -472,16 +473,15 @@ wxDEFINE_EVENT( wxEVT_WINDOW_MODAL_DIALOG_CLOSED , wxWindowModalDialogEvent  );
 
 IMPLEMENT_DYNAMIC_CLASS(wxWindowModalDialogEvent, wxCommandEvent)
 
-bool wxDialogBase::ShowWindowModal ()
+void wxDialogBase::ShowWindowModal ()
 {
     ShowModal();
     SendWindowModalDialogEvent ( wxEVT_WINDOW_MODAL_DIALOG_CLOSED  );
-    return true;
 }
 
 void wxDialogBase::SendWindowModalDialogEvent ( wxEventType type )
 {
-    wxCommandEvent event ( type, GetId());
+    wxWindowModalDialogEvent event ( type, GetId());
     event.SetEventObject(this);
 
     if ( !GetEventHandler()->ProcessEvent(event) )