#include "wx/wxprec.h"
#include "wx/dialog.h"
+#include "wx/evtloop.h"
#ifndef WX_PRECOMP
#include "wx/app.h"
#include "wx/osx/private.h"
+static int s_openDialogs = 0;
+bool wxDialog::OSXHasModalDialogsOpen()
+{
+ return s_openDialogs > 0;
+}
+
+void wxDialog::OSXBeginModalDialog()
+{
+ s_openDialogs++;
+}
-// Lists to keep track of windows, so we can disable/enable them
-// for modal dialogs
+void wxDialog::OSXEndModalDialog()
+{
+ wxASSERT_MSG( s_openDialogs > 0, "incorrect internal modal dialog count");
+ s_openDialogs--;
+}
-wxList wxModalDialogs;
IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
void wxDialog::Init()
{
- m_isModalStyle = false;
+ m_modality = wxDIALOG_MODALITY_NONE;
+ m_eventLoop = NULL;
}
bool wxDialog::Create( wxWindow *parent,
return true;
}
-void wxDialog::SetModal( bool flag )
-{
- if ( flag )
- {
- m_isModalStyle = true;
- }
- else
- {
- m_isModalStyle = false;
- }
-}
-
wxDialog::~wxDialog()
{
SendDestroyEvent();
bool wxDialog::IsModal() const
{
- return wxModalDialogs.Find((wxDialog *)this) != NULL; // const_cast
- // return m_isModalStyle;
+ return m_modality != wxDIALOG_MODALITY_NONE;
}
-
bool wxDialog::Show(bool show)
{
- if ( !wxDialogBase::Show(show) )
- // nothing to do
- return false;
+ if ( m_modality == wxDIALOG_MODALITY_WINDOW_MODAL )
+ {
+ if ( !wxWindow::Show(show) )
+ // nothing to do
+ return false;
+ }
+ else
+ {
+ if ( !wxDialogBase::Show(show) )
+ // nothing to do
+ return false;
+ }
if (show && CanDoLayoutAdaptation())
DoLayoutAdaptation();
// usually will result in TransferDataToWindow() being called
InitDialog();
- if ( m_isModalStyle )
+ if ( !show )
{
- if ( show )
+ switch( m_modality )
{
- DoShowModal();
- }
- else // end of modal dialog
- {
- // this will cause IsModalShowing() return false and our local
- // message loop will terminate
- wxModalDialogs.DeleteObject(this);
+ case wxDIALOG_MODALITY_WINDOW_MODAL:
+ EndWindowModal(); // OS X implementation method for cleanup
+ SendWindowModalDialogEvent ( wxEVT_WINDOW_MODAL_DIALOG_CLOSED );
+ break;
+ default:
+ break;
}
+ m_modality = wxDIALOG_MODALITY_NONE;
}
-
+
return true;
}
// Replacement for Show(true) for modal dialogs - returns return code
int wxDialog::ShowModal()
{
- if ( !m_isModalStyle )
- SetModal(true);
+ m_modality = wxDIALOG_MODALITY_APP_MODAL;
+
+ Show();
+
+ wxModalEventLoop modalLoop(this);
+ m_eventLoop = &modalLoop;
+
+ wxDialog::OSXBeginModalDialog();
+ modalLoop.Run();
+ wxDialog::OSXEndModalDialog();
+
+ m_eventLoop = NULL;
+
+ return GetReturnCode();
+}
- if ( IsShown() )
- DoShowModal();
- else
- Show(true);
+void wxDialog::ShowWindowModal()
+{
+ m_modality = wxDIALOG_MODALITY_WINDOW_MODAL;
+
+ Show();
+
+ DoShowWindowModal();
+}
- return GetReturnCode();
+wxDialogModality wxDialog::GetModality() const
+{
+ return m_modality;
}
// NB: this function (surprisingly) may be called for both modal and modeless
// dialogs and should work for both of them
void wxDialog::EndModal(int retCode)
{
+ if ( m_eventLoop )
+ m_eventLoop->Exit(retCode);
+
SetReturnCode(retCode);
Show(false);
- SetModal(false);
- if (GetModality() == wxDIALOG_MODALITY_WINDOW_MODAL)
- {
- EndWindowModal(); // OS X implementation method for cleanup
- SendWindowModalDialogEvent ( wxEVT_WINDOW_MODAL_DIALOG_CLOSED );
- }
}