X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e306597309a120f2ae91385c731a5cb2722c52aa..2078220ed6605d5d3bba16afe1a231b3e92fa9d8:/src/mac/dialog.cpp?ds=inline

diff --git a/src/mac/dialog.cpp b/src/mac/dialog.cpp
index bf3cae5e35..755ad0192a 100644
--- a/src/mac/dialog.cpp
+++ b/src/mac/dialog.cpp
@@ -19,21 +19,26 @@
 #include "wx/app.h"
 #include "wx/settings.h"
 
+#include "wx/mac/uma.h"
+
 // Lists to keep track of windows, so we can disable/enable them
 // for modal dialogs
 wxList wxModalDialogs;
-wxList wxModelessWindows;  // Frames and modeless dialogs
+//wxList wxModelessWindows;  // Frames and modeless dialogs
 extern wxList wxPendingDelete;
 
 #if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxPanel)
+IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
 
-BEGIN_EVENT_TABLE(wxDialog, wxPanel)
+BEGIN_EVENT_TABLE(wxDialog, wxDialogBase)
   EVT_BUTTON(wxID_OK, wxDialog::OnOK)
   EVT_BUTTON(wxID_APPLY, wxDialog::OnApply)
   EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel)
+
   EVT_CHAR_HOOK(wxDialog::OnCharHook)
+
   EVT_SYS_COLOUR_CHANGED(wxDialog::OnSysColourChanged)
+
   EVT_CLOSE(wxDialog::OnCloseWindow)
 END_EVENT_TABLE()
 
@@ -41,7 +46,8 @@ END_EVENT_TABLE()
 
 wxDialog::wxDialog()
 {
-    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+  	m_isShown = FALSE;
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
 }
 
 bool wxDialog::Create(wxWindow *parent, wxWindowID id,
@@ -51,63 +57,48 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
            long style,
            const wxString& name)
 {
-  m_windowStyle = style;
 
-  SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
-  SetName(name);
+  SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
   
-  if (!parent)
-    wxTopLevelWindows.Append(this);
-
-  if (parent) parent->AddChild(this);
 
-  if ( id == -1 )
-  	m_windowId = (int)NewControlId();
-  else
-	m_windowId = id;
+  if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
+        return FALSE;
 
-  // TODO: create dialog
+	MacCreateRealWindow( title , pos , size , MacRemoveBordersFromStyle(style)  , name ) ;
 
-  return FALSE;
+	m_macWindowBackgroundTheme = kThemeBrushDialogBackgroundActive ;
+  return TRUE;
 }
 
 void wxDialog::SetModal(bool flag)
 {
-	if ( flag )
-		m_windowStyle |= wxDIALOG_MODAL ;
-	else
-		if ( m_windowStyle & wxDIALOG_MODAL )
-  			m_windowStyle -= wxDIALOG_MODAL ;
-  
-  wxModelessWindows.DeleteObject(this);
-  if (!flag)
-    wxModelessWindows.Append(this);
-}
-
-wxDialog::~wxDialog()
-{
-    // TODO
-    wxTopLevelWindows.DeleteObject(this);
-
-    if ( (GetWindowStyleFlag() & wxDIALOG_MODAL) != wxDIALOG_MODAL )
-      wxModelessWindows.DeleteObject(this);
+  if ( flag )
+    {
+        m_windowStyle |= wxDIALOG_MODAL;
 
-    // If this is the last top-level window, exit.
-    if (wxTheApp && (wxTopLevelWindows.Number() == 0))
+        wxModelessWindows.DeleteObject(this);
+    }
+    else
     {
-      wxTheApp->SetTopWindow(NULL);
+        m_windowStyle &= ~wxDIALOG_MODAL;
 
-      if (wxTheApp->GetExitOnFrameDelete())
-      {
-         // TODO: exit
-      }
+        wxModelessWindows.Append(this);
     }
 }
 
-// By default, pressing escape cancels the dialog
+wxDialog::~wxDialog()
+{
+	m_isBeingDeleted = TRUE ;
+  Show(FALSE);
+}
+
+// By default, pressing escape cancels the dialog , on mac command-stop does the same thing
 void wxDialog::OnCharHook(wxKeyEvent& event)
 {
-  if (event.m_keyCode == WXK_ESCAPE)
+  if (
+    ( event.m_keyCode == WXK_ESCAPE || 
+      ( event.m_keyCode == '.' && event.MetaDown() ) )
+     && FindWindow(wxID_CANCEL) )
   {
 		// Behaviour changed in 2.0: we'll send a Cancel message
 		// to the dialog instead of Close.
@@ -121,120 +112,128 @@ void wxDialog::OnCharHook(wxKeyEvent& event)
   event.Skip();
 }
 
-void wxDialog::Iconize(bool WXUNUSED(iconize))
+bool wxDialog::IsModal() const
 {
-    // TODO
+    return (GetWindowStyleFlag() & wxDIALOG_MODAL) != 0;
 }
 
-bool wxDialog::IsIconized() const
-{
-    // TODO
-    return FALSE;
-}
 
-void wxDialog::SetClientSize(int width, int height)
+bool wxDialog::IsModalShowing() const
 {
-    // TODO
+    return wxModalDialogs.Find((wxDialog *)this) != NULL; // const_cast
 }
 
-void wxDialog::GetPosition(int *x, int *y) const
-{
-    // TODO
-}
+extern bool s_macIsInModalLoop ;
 
 bool wxDialog::Show(bool show)
 {
-    // TODO
-    return FALSE;
-}
+    if ( !wxDialogBase::Show(show) )
+    {
+        // nothing to do
+        return FALSE;
+    }
 
-void wxDialog::SetTitle(const wxString& title)
-{
-    // TODO
-}
+    if ( show )
+    {
+        // usually will result in TransferDataToWindow() being called
+        InitDialog();
+    }
 
-wxString wxDialog::GetTitle() const
-{
-    // TODO
-    return wxString("");
+    if ( IsModal() )
+    {
+        if ( show )
+        {
+            DoShowModal();
+        }
+        else // end of modal dialog
+        {
+            // this will cause IsModalShowing() return FALSE and our local
+            // message loop will terminate
+            wxModalDialogs.DeleteObject(this);
+        }
+    }
+
+    return TRUE;
 }
 
-void wxDialog::Centre(int direction)
+void wxDialog::DoShowModal()
 {
-  int x_offset,y_offset ;
-  int display_width, display_height;
-  int  width, height, x, y;
-  wxWindow *parent = GetParent();
-  if ((direction & wxCENTER_FRAME) && parent)
-  {
-      parent->GetPosition(&x_offset,&y_offset) ;
-      parent->GetSize(&display_width,&display_height) ;
-  }
-  else
-  {
-    wxDisplaySize(&display_width, &display_height);
-    x_offset = 0 ;
-    y_offset = 0 ;
-  }
+    wxCHECK_RET( !IsModalShowing(), _T("DoShowModal() called twice") );
 
-  GetSize(&width, &height);
-  GetPosition(&x, &y);
+    wxModalDialogs.Append(this);
 
-  if (direction & wxHORIZONTAL)
-    x = (int)((display_width - width)/2);
-  if (direction & wxVERTICAL)
-    y = (int)((display_height - height)/2);
+  	wxWindow *parent = GetParent();
+
+    // remember where the focus was
+    wxWindow *winFocus = FindFocus();
+    if ( !winFocus )
+    {
+        winFocus = parent;
+    }
+    if ( !winFocus )
+    {
+        winFocus = wxTheApp->GetTopWindow();
+    }
+	// TODO : test whether parent gets disabled
 
-  SetSize(x+x_offset, y+y_offset, width, height);
+	bool formerModal = s_macIsInModalLoop ;
+	s_macIsInModalLoop = true ;
+
+	while ( IsModalShowing() )
+	{
+		while ( !wxTheApp->Pending() && wxTheApp->ProcessIdle() )
+		{
+		}
+		wxTheApp->MacDoOneEvent() ;
+	}
+	
+	s_macIsInModalLoop = formerModal ;
+
+    // TODO probably reenable the parent window if any
+
+    // and restore focus
+    if ( winFocus )
+    {
+        winFocus->SetFocus();
+    }
 }
 
+
 // Replacement for Show(TRUE) for modal dialogs - returns return code
 int wxDialog::ShowModal()
 {
-    m_windowStyle |= wxDIALOG_MODAL;
-    // TODO: modal showing
-	Show(TRUE);
-	return GetReturnCode();
+  m_windowStyle |= wxDIALOG_MODAL;
+  Show(TRUE);
+  return GetReturnCode();
 }
 
+// NB: this function (surprizingly) may be called for both modal and modeless
+//     dialogs and should work for both of them
 void wxDialog::EndModal(int retCode)
 {
-	SetReturnCode(retCode);
-    // TODO modal un-showing
-	Show(FALSE);
+  SetReturnCode(retCode);
+  Show(FALSE);
 }
 
 // Standard buttons
 void wxDialog::OnOK(wxCommandEvent& event)
 {
-	if ( Validate() && TransferDataFromWindow() )
-	{
-        if ( IsModal() )
-            EndModal(wxID_OK);
-        else
-        {
-		    SetReturnCode(wxID_OK);
-		    this->Show(FALSE);
-        }
-	}
+  if ( Validate() && TransferDataFromWindow() )
+  {
+      EndModal(wxID_OK);
+  }
 }
 
 void wxDialog::OnApply(wxCommandEvent& event)
 {
-	if (Validate())
-		TransferDataFromWindow();
-	// TODO probably need to disable the Apply button until things change again
+  if (Validate())
+    TransferDataFromWindow();
+  // TODO probably need to disable the Apply button until things change again
 }
 
 void wxDialog::OnCancel(wxCommandEvent& event)
 {
-    if ( IsModal() )
         EndModal(wxID_CANCEL);
-    else
-    {
-        SetReturnCode(wxID_CANCEL);
-		this->Show(FALSE);
-    }
 }
 
 void wxDialog::OnCloseWindow(wxCloseEvent& event)
@@ -254,12 +253,12 @@ void wxDialog::OnCloseWindow(wxCloseEvent& event)
     // The default OnCancel (above) simply ends a modal dialog, and hides a modeless dialog.
 
     static wxList closing;
-    
+
     if ( closing.Member(this) )
         return;
-    
+
     closing.Append(this);
-    
+
     wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
     cancelEvent.SetEventObject( this );
     GetEventHandler()->ProcessEvent(cancelEvent); // This may close the dialog
@@ -267,20 +266,9 @@ void wxDialog::OnCloseWindow(wxCloseEvent& event)
     closing.DeleteObject(this);
 }
 
-// Destroy the window (delayed, if a managed window)
-bool wxDialog::Destroy()
-{
-  if (!wxPendingDelete.Member(this))
-    wxPendingDelete.Append(this);
-  return TRUE;
-}
-
 void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
-  SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+  SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
   Refresh();
 }
 
-void wxDialog::Fit()
-{
-}