X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/51abe921b849be69f02c174365c9a7bc8b46bd08..4e89ceb11ee28f55050dfc03c69e72cd84f98cdf:/src/mac/carbon/dialog.cpp?ds=inline

diff --git a/src/mac/carbon/dialog.cpp b/src/mac/carbon/dialog.cpp
index 304fbb915b..755ad0192a 100644
--- a/src/mac/carbon/dialog.cpp
+++ b/src/mac/carbon/dialog.cpp
@@ -19,24 +19,26 @@
 #include "wx/app.h"
 #include "wx/settings.h"
 
-#include <wx/mac/uma.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)
-	EVT_SIZE(wxDialog::OnSize)
+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()
 
@@ -44,9 +46,8 @@ END_EVENT_TABLE()
 
 wxDialog::wxDialog()
 {
-  m_isShown = FALSE;
-  m_modalShowing = FALSE;
-    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+  	m_isShown = FALSE;
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
 }
 
 bool wxDialog::Create(wxWindow *parent, wxWindowID id,
@@ -56,107 +57,48 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
            long style,
            const wxString& name)
 {
-  m_windowStyle = style;
-  m_isShown = FALSE;
-  m_modalShowing = FALSE;
 
-#if wxUSE_TOOLTIPS
-    m_hwndToolTip = 0;
-#endif
-  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;
-
-	Rect theBoundsRect;
-
-  m_x = (int)pos.x;
-  m_y = (int)pos.y;
-  if ( m_y < 50 )
-  	m_y = 50 ;
-  if ( m_x < 20 )
-  	m_x = 20 ;
-  	
-  m_width = size.x;
-	if (m_width == -1) 
-		m_width = 20;
-  m_height = size.y;
-	if (m_height == -1) 
-		m_height = 20;
-
-	::SetRect(&theBoundsRect, m_x, m_y, m_x + m_width, m_y + m_height);
-	m_macWindowData = new MacWindowData() ;
-
-	WindowClass wclass = kMovableModalWindowClass ;
-	WindowAttributes attr = kWindowNoAttributes ;
-	
-	if ( ( m_windowStyle & wxMINIMIZE_BOX ) || ( m_windowStyle & wxMAXIMIZE_BOX ) )
-	{
-		attr |= kWindowFullZoomAttribute ;
-		attr |= kWindowResizableAttribute ;
-	}
 
-	UMACreateNewWindow( wclass , attr , &theBoundsRect , &m_macWindowData->m_macWindow ) ;
-	wxAssociateWinWithMacWindow( m_macWindowData->m_macWindow , this ) ;
-	wxString label ;
-	if( wxApp::s_macDefaultEncodingIsPC )
-		label = wxMacMakeMacStringFromPC( title ) ;
-	else
-		label = title ;
-	UMASetWTitleC( m_macWindowData->m_macWindow , label ) ;
-	m_macWindowData->m_macWindowBackgroundTheme = kThemeBrushDialogBackgroundActive ;
-	UMACreateRootControl( m_macWindowData->m_macWindow , &m_macWindowData->m_macRootControl ) ;
-	m_macWindowData->m_macFocus = NULL ;
+  if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
+        return FALSE;
+
+	MacCreateRealWindow( title , pos , size , MacRemoveBordersFromStyle(style)  , name ) ;
+
+	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);
+  if ( flag )
+    {
+        m_windowStyle |= wxDIALOG_MODAL;
+
+        wxModelessWindows.DeleteObject(this);
+    }
+    else
+    {
+        m_windowStyle &= ~wxDIALOG_MODAL;
+
+        wxModelessWindows.Append(this);
+    }
 }
 
 wxDialog::~wxDialog()
 {
 	m_isBeingDeleted = TRUE ;
-    wxTopLevelWindows.DeleteObject(this);
-
-  m_modalShowing = FALSE;
-
-  if ( (GetWindowStyleFlag() & wxDIALOG_MODAL) != wxDIALOG_MODAL )
-    wxModelessWindows.DeleteObject(this);
-
-    // If this is the last top-level window, exit.
-    if (wxTheApp && (wxTopLevelWindows.Number() == 0))
-    {
-      wxTheApp->SetTopWindow(NULL);
-
-      if (wxTheApp->GetExitOnFrameDelete())
-      {
-       	wxTheApp->ExitMainLoop() ;
-      }
-    }
+  Show(FALSE);
 }
 
-// By default, pressing escape cancels the dialog
+// 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.
@@ -170,157 +112,92 @@ void wxDialog::OnCharHook(wxKeyEvent& event)
   event.Skip();
 }
 
-void wxDialog::Iconize(bool WXUNUSED(iconize))
+bool wxDialog::IsModal() const
 {
-	// mac dialogs cannot be iconized
+    return (GetWindowStyleFlag() & wxDIALOG_MODAL) != 0;
 }
 
-bool wxDialog::IsIconized() const
-{
-	// mac dialogs cannot be iconized
-    return FALSE;
-}
 
-void wxDialog::DoSetClientSize(int width, int height)
+bool wxDialog::IsModalShowing() const
 {
-	wxWindow::DoSetClientSize( width , height ) ;
+    return wxModalDialogs.Find((wxDialog *)this) != NULL; // const_cast
 }
 
-void wxDialog::GetPosition(int *x, int *y) const
-{
-	DoGetPosition( x , y ) ;
-}
+extern bool s_macIsInModalLoop ;
 
-bool wxDialog::IsShown() const
+bool wxDialog::Show(bool show)
 {
-  return m_isShown;
-}
+    if ( !wxDialogBase::Show(show) )
+    {
+        // nothing to do
+        return FALSE;
+    }
 
-bool wxDialog::IsModal() const
-{
-    return wxModalDialogs.Find((wxDialog *)this) != 0; // const_cast
-}
+    if ( show )
+    {
+        // usually will result in TransferDataToWindow() being called
+        InitDialog();
+    }
 
+    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);
+        }
+    }
 
-extern bool s_macIsInModalLoop ;
+    return TRUE;
+}
 
-bool wxDialog::Show(bool show)
+void wxDialog::DoShowModal()
 {
-  m_isShown = show;
+    wxCHECK_RET( !IsModalShowing(), _T("DoShowModal() called twice") );
 
-  if (show)
-    InitDialog();
+    wxModalDialogs.Append(this);
 
-  bool modal =  ((GetWindowStyleFlag() & wxDIALOG_MODAL) == wxDIALOG_MODAL) ;
+  	wxWindow *parent = GetParent();
 
-#if WXGARBAGE_COLLECTION_ON /* MATTHEW: GC */
-  if (!modal) 
-  {
-    if (show) 
+    // remember where the focus was
+    wxWindow *winFocus = FindFocus();
+    if ( !winFocus )
     {
-      if (!wxModelessWindows.Find(this))
-        wxModelessWindows.Append(this);
-    } 
-    else
-      wxModelessWindows.DeleteObject(this);
-  }
-  if (show) 
-  {
-    if (!wxTopLevelWindows.Find(this))
-      	wxTopLevelWindows.Append(this);
-  } 
-  else
-    	wxTopLevelWindows.DeleteObject(this);
-#endif
+        winFocus = parent;
+    }
+    if ( !winFocus )
+    {
+        winFocus = wxTheApp->GetTopWindow();
+    }
+	// TODO : test whether parent gets disabled
 
-	if ( modal )
-	{
-		s_macIsInModalLoop = true ;
-	  	if (show)
-	  	{
-     		if (m_modalShowing)
-      		{
-//        		BringWindowToTop((HWND) GetHWND());
-        		return TRUE;
-      		}
-
-      		m_modalShowing = TRUE;
-      		// if we don't do it, some window might be deleted while we have pointers
-      		// to them in our disabledWindows list and the program will crash when it
-      		// will try to reenable them after the modal dialog end
-     		wxTheApp->DeletePendingObjects();
-
-    		UMAShowWindow( m_macWindowData->m_macWindow ) ;
-    		UMASelectWindow( m_macWindowData->m_macWindow ) ;
-
-      	if (!wxModalDialogs.Member(this))
-        	wxModalDialogs.Append(this);
-
-      	while (wxModalDialogs.Member(this) )
-      	{
-      		wxTheApp->MacDoOneEvent() ;
-      	}
-	  }
-	  else
-	  {
-      	wxModalDialogs.DeleteObject(this);
-    	UMAHideWindow( m_macWindowData->m_macWindow ) ;
-	  }
-	  s_macIsInModalLoop = false ;
-	}
-	else // !modal
+	bool formerModal = s_macIsInModalLoop ;
+	s_macIsInModalLoop = true ;
+
+	while ( IsModalShowing() )
 	{
-	  if (show)
-	  {
-    	UMAShowWindow( m_macWindowData->m_macWindow ) ;
-    	UMASelectWindow( m_macWindowData->m_macWindow ) ;
-	  }
-	  else
-	  {
-    	UMAHideWindow( m_macWindowData->m_macWindow ) ;
-	  }
+		while ( !wxTheApp->Pending() && wxTheApp->ProcessIdle() )
+		{
+		}
+		wxTheApp->MacDoOneEvent() ;
 	}
-	return TRUE ;
-}
+	
+	s_macIsInModalLoop = formerModal ;
 
-void wxDialog::SetTitle(const wxString& title)
-{
-	wxWindow::SetTitle( title ) ;
-}
+    // TODO probably reenable the parent window if any
 
-wxString wxDialog::GetTitle() const
-{
-	return wxWindow::GetTitle() ;
+    // and restore focus
+    if ( winFocus )
+    {
+        winFocus->SetFocus();
+    }
 }
 
-void wxDialog::Centre(int direction)
-{
-  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 ;
-  }
-
-  GetSize(&width, &height);
-  GetPosition(&x, &y);
-
-  if (direction & wxHORIZONTAL)
-    x = (int)((display_width - width)/2);
-  if (direction & wxVERTICAL)
-    y = (int)((display_height - height)/2);
-
-  SetSize(x+x_offset, y+y_offset, width, height);
-}
 
 // Replacement for Show(TRUE) for modal dialogs - returns return code
 int wxDialog::ShowModal()
@@ -330,6 +207,8 @@ int wxDialog::ShowModal()
   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);
@@ -341,13 +220,7 @@ void wxDialog::OnOK(wxCommandEvent& event)
 {
   if ( Validate() && TransferDataFromWindow() )
   {
-        if ( IsModal() )
-            EndModal(wxID_OK);
-        else
-        {
-            SetReturnCode(wxID_OK);
-            this->Show(FALSE);
-        }
+      EndModal(wxID_OK);
   }
 }
 
@@ -360,13 +233,7 @@ void wxDialog::OnApply(wxCommandEvent& event)
 
 void wxDialog::OnCancel(wxCommandEvent& event)
 {
-    if ( IsModal() )
         EndModal(wxID_CANCEL);
-    else
-    {
-        SetReturnCode(wxID_CANCEL);
-        this->Show(FALSE);
-    }
 }
 
 void wxDialog::OnCloseWindow(wxCloseEvent& event)
@@ -399,33 +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::OnSize(wxSizeEvent& WXUNUSED(event))
-{
-  // if we're using constraints - do use them
-  #if wxUSE_CONSTRAINTS
-    if ( GetAutoLayout() )
-    {
-      Layout();
-    }
-  #endif
-}
-
 void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
-  SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+  SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
   Refresh();
 }
 
-void wxDialog::Fit()
-{
-  wxWindow::Fit();
-}
-