Fix for non-CG mode

[wxWidgets.git] / src / mac / carbon / dialog.cpp

diff --git a/src/mac/carbon/dialog.cpp b/src/mac/carbon/dialog.cpp
index e2bdb7c984596f4184b3ec7e3e6b7b6530c6bbe3..50cbb8c5ae8c245da68b0b05b09651bb5d82fb90 100644 (file)
--- a/src/mac/carbon/dialog.cpp
+++ b/src/mac/carbon/dialog.cpp
@@ -1,289 +1,195 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dialog.cpp
+// Name:        src/mac/carbon/dialog.cpp

 // Purpose:     wxDialog class
 // Purpose:     wxDialog class

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "dialog.h"
-#endif
+#include "wx/wxprec.h"

 
 #include "wx/dialog.h"
 
 #include "wx/dialog.h"

-#include "wx/utils.h"
-#include "wx/frame.h"
-#include "wx/app.h"
-#include "wx/settings.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/utils.h"
+    #include "wx/frame.h"
+    #include "wx/settings.h"
+#endif // WX_PRECOMP
+
+#include "wx/mac/uma.h"
+

 
 // Lists to keep track of windows, so we can disable/enable them
 // for modal dialogs
 wxList wxModalDialogs;
 
 // Lists to keep track of windows, so we can disable/enable them
 // for modal dialogs
 wxList wxModalDialogs;

-wxList wxModelessWindows;  // Frames and modeless dialogs
-extern wxList wxPendingDelete;
-
-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxPanel)

 
 

-BEGIN_EVENT_TABLE(wxDialog, wxPanel)
-  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()
+IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)

 
 

-#endif
-
-wxDialog::wxDialog()
+void wxDialog::Init()

 {
 {

-    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+    m_isModalStyle = false;

 }
 
 }
 

-bool wxDialog::Create(wxWindow *parent, wxWindowID id,
-           const wxString& title,
-           const wxPoint& pos,
-           const wxSize& size,
-           long style,
-           const wxString& name)
+bool wxDialog::Create( wxWindow *parent,
+    wxWindowID id,
+    const wxString& title,
+    const wxPoint& pos,
+    const wxSize& size,
+    long style,
+    const wxString& name )

 {
 {

-  m_windowStyle = style;
+    SetExtraStyle( GetExtraStyle() | wxTOPLEVEL_EX_DIALOG );

 
 

-  SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
-  SetName(name);
-  
-  if (!parent)
-    wxTopLevelWindows.Append(this);
+    // All dialogs should really have this style...
+    style |= wxTAB_TRAVERSAL;

 
 

-  if (parent) parent->AddChild(this);
+    // ...but not these styles
+    style &= ~(wxYES | wxOK | wxNO); // | wxCANCEL

 
 

-  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
-
-  return FALSE;
-}
+#if TARGET_API_MAC_OSX
+    HIViewRef growBoxRef = 0 ;
+    OSStatus err = HIViewFindByID( HIViewGetRoot( (WindowRef)m_macWindow ), kHIViewWindowGrowBoxID, &growBoxRef  );
+    if ( err == noErr && growBoxRef != 0 )
+        HIGrowBoxViewSetTransparent( growBoxRef, true ) ;
+#endif

 
 

-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);
+    return true;

 }
 
 }
 

-wxDialog::~wxDialog()
+void wxDialog::SetModal( bool flag )

 {
 {

-    // TODO
-    wxTopLevelWindows.DeleteObject(this);
+    if ( flag )
+    {
+        m_isModalStyle = true;

 
 

-    if ( (GetWindowStyleFlag() & wxDIALOG_MODAL) != wxDIALOG_MODAL )
-      wxModelessWindows.DeleteObject(this);
+        wxModelessWindows.DeleteObject( this );

 
 

-    // If this is the last top-level window, exit.
-    if (wxTheApp && (wxTopLevelWindows.Number() == 0))
+#if TARGET_CARBON
+        SetWindowModality( (WindowRef)MacGetWindowRef(), kWindowModalityAppModal, NULL ) ;
+#endif
+    }
+    else

     {
     {

-      wxTheApp->SetTopWindow(NULL);
+        m_isModalStyle = false;

 
 

-      if (wxTheApp->GetExitOnFrameDelete())
-      {
-         // TODO: exit
-      }
+        wxModelessWindows.Append( this );

     }
 }
 
     }
 }
 

-// By default, pressing escape cancels the dialog
-void wxDialog::OnCharHook(wxKeyEvent& event)
-{
-  if (event.m_keyCode == WXK_ESCAPE)
-  {
-               // Behaviour changed in 2.0: we'll send a Cancel message
-               // to the dialog instead of Close.
-               wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
-               cancelEvent.SetEventObject( this );
-               GetEventHandler()->ProcessEvent(cancelEvent);
-
-               return;
-  }
-  // We didn't process this event.
-  event.Skip();
-}
-
-void wxDialog::Iconize(bool WXUNUSED(iconize))
-{
-    // TODO
-}
-
-bool wxDialog::IsIconized() const
-{
-    // TODO
-    return FALSE;
-}
-
-void wxDialog::SetClientSize(int width, int height)
+wxDialog::~wxDialog()

 {
 {

-    // TODO
+    m_isBeingDeleted = true;
+    Show(false);

 }
 
 }
 

-void wxDialog::GetPosition(int *x, int *y) const
+// On mac command-stop does the same thing as Esc, let the base class know
+// about it
+bool wxDialog::IsEscapeKey(const wxKeyEvent& event)

 {
 {

-    // TODO
-}
+    if ( event.GetKeyCode() == '.' && event.GetModifiers() == wxMOD_CMD )
+        return true;

 
 

-bool wxDialog::Show(bool show)
-{
-    // TODO
-    return FALSE;
+    return wxDialogBase::IsEscapeKey(event);

 }
 
 }
 

-void wxDialog::SetTitle(const wxString& title)
+bool wxDialog::IsModal() const

 {
 {

-    // TODO
+    return wxModalDialogs.Find((wxDialog *)this) != NULL; // const_cast
+    //    return m_isModalStyle;

 }
 
 }
 

-wxString wxDialog::GetTitle() const
-{
-    // TODO
-    return wxString("");
-}

 
 

-void wxDialog::Centre(int direction)
+bool wxDialog::IsModalShowing() const

 {
 {

-  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);
+    return wxModalDialogs.Find((wxDialog *)this) != NULL; // const_cast

 }
 
 }
 

-// Replacement for Show(TRUE) for modal dialogs - returns return code
-int wxDialog::ShowModal()
+bool wxDialog::Show(bool show)

 {
 {

-    m_windowStyle |= wxDIALOG_MODAL;
-    // TODO: modal showing
-       Show(TRUE);
-       return GetReturnCode();
-}
+    if ( !wxDialogBase::Show(show) )
+        // nothing to do
+        return false;

 
 

-void wxDialog::EndModal(int retCode)
-{
-       SetReturnCode(retCode);
-    // TODO modal un-showing
-       Show(FALSE);
-}
+    if ( show )
+        // usually will result in TransferDataToWindow() being called
+        InitDialog();

 
 

-// Standard buttons
-void wxDialog::OnOK(wxCommandEvent& event)
-{
-       if ( Validate() && TransferDataFromWindow() )
-       {
-        if ( IsModal() )
-            EndModal(wxID_OK);
-        else
+    if ( m_isModalStyle )
+    {
+        if ( show )

         {
         {

-                   SetReturnCode(wxID_OK);
-                   this->Show(FALSE);
+            DoShowModal();

         }
         }

-       }
-}
+        else // end of modal dialog
+        {
+            // this will cause IsModalShowing() return false and our local
+            // message loop will terminate
+            wxModalDialogs.DeleteObject(this);
+        }
+    }

 
 

-void wxDialog::OnApply(wxCommandEvent& event)
-{
-       if (Validate())
-               TransferDataFromWindow();
-       // TODO probably need to disable the Apply button until things change again
+    return true;

 }
 
 }
 

-void wxDialog::OnCancel(wxCommandEvent& event)
-{
-    if ( IsModal() )
-        EndModal(wxID_CANCEL);
-    else
-    {
-        SetReturnCode(wxID_CANCEL);
-               this->Show(FALSE);
-    }
-}
+#if !TARGET_CARBON
+extern bool s_macIsInModalLoop ;
+#endif

 
 

-bool wxDialog::OnClose()
+void wxDialog::DoShowModal()

 {
 {

-       // Behaviour changed in 2.0: we'll send a Cancel message by default,
-    // which may close the dialog.
-    // Check for looping if the Cancel event handler calls Close()
+    wxCHECK_RET( !IsModalShowing(), wxT("DoShowModal() called twice") );

 
 

-    static wxList closing;
+    wxModalDialogs.Append(this);

 
 

-    if ( closing.Member(this) )
-        return FALSE;
+    SetFocus() ;

 
 

-    closing.Append(this);
-
-       wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
-       cancelEvent.SetEventObject( this );
-       GetEventHandler()->ProcessEvent(cancelEvent);
-
-    closing.DeleteObject(this);
-
-       return FALSE;
-}
+#if TARGET_CARBON
+    BeginAppModalStateForWindow(  (WindowRef) MacGetWindowRef()) ;
+#else
+    // TODO : test whether parent gets disabled
+    bool formerModal = s_macIsInModalLoop ;
+    s_macIsInModalLoop = true ;
+#endif

 
 

-void wxDialog::OnCloseWindow(wxCloseEvent& event)
-{
-    // Compatibility
-    if ( GetEventHandler()->OnClose() || !event.CanVeto())
+    while ( IsModalShowing() )

     {
     {

-        this->Destroy();
+        wxTheApp->MacDoOneEvent() ;
+        // calls process idle itself

     }
     }

-    else
-        event.Veto(TRUE);
-}

 
 

-// Destroy the window (delayed, if a managed window)
-bool wxDialog::Destroy()
-{
-  if (!wxPendingDelete.Member(this))
-    wxPendingDelete.Append(this);
-  return TRUE;
+#if TARGET_CARBON
+    EndAppModalStateForWindow( (WindowRef) MacGetWindowRef() ) ;
+#else
+    // TODO probably reenable the parent window if any
+    s_macIsInModalLoop = formerModal ;
+#endif

 }
 
 }
 

-void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& event)
+
+// Replacement for Show(true) for modal dialogs - returns return code
+int wxDialog::ShowModal()

 {
 {

-  SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
-  Refresh();
+    if ( !m_isModalStyle )
+        SetModal(true);
+
+    Show(true);
+
+    return GetReturnCode();

 }
 
 }
 

-void wxDialog::Fit()
+// 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);
+    Show(false);
+    SetModal(false);

 }
 }

+