s_openDialogs--;
}
-
-IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
-
void wxDialog::Init()
{
m_modality = wxDIALOG_MODALITY_NONE;
// nothing to do
return false;
}
- else
+ else
{
if ( !wxDialogBase::Show(show) )
// nothing to do
{
case wxDIALOG_MODALITY_WINDOW_MODAL:
EndWindowModal(); // OS X implementation method for cleanup
- SendWindowModalDialogEvent ( wxEVT_WINDOW_MODAL_DIALOG_CLOSED );
+ SendWindowModalDialogEvent ( wxEVT_WINDOW_MODAL_DIALOG_CLOSED );
break;
default:
break;
}
m_modality = wxDIALOG_MODALITY_NONE;
}
-
+
return true;
}
int wxDialog::ShowModal()
{
m_modality = wxDIALOG_MODALITY_APP_MODAL;
-
+
Show();
wxModalEventLoop modalLoop(this);
m_eventLoop = &modalLoop;
-
+
wxDialog::OSXBeginModalDialog();
modalLoop.Run();
wxDialog::OSXEndModalDialog();
-
+
m_eventLoop = NULL;
-
+
return GetReturnCode();
}
void wxDialog::ShowWindowModal()
{
m_modality = wxDIALOG_MODALITY_WINDOW_MODAL;
-
+
Show();
-
+
DoShowWindowModal();
}
{
if ( m_eventLoop )
m_eventLoop->Exit(retCode);
-
+
SetReturnCode(retCode);
Show(false);
}