correct boundaries for carbon

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

diff --git a/src/mac/dialog.cpp b/src/mac/dialog.cpp
index eed25f3fb7bd6922eed982788497ecf962acf9f2..f29ed3e59eab4d46b446f9f16aa155c56b24c0e4 100644 (file)
--- a/src/mac/dialog.cpp
+++ b/src/mac/dialog.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        dialog.cpp
 // Purpose:     wxDialog class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        dialog.cpp
 // 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__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -30,7 +30,7 @@ extern wxList wxPendingDelete;
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
 

-BEGIN_EVENT_TABLE(wxDialog, wxTopLevelWindow)
+BEGIN_EVENT_TABLE(wxDialog, wxDialogBase)

   EVT_BUTTON(wxID_OK, wxDialog::OnOK)
   EVT_BUTTON(wxID_APPLY, wxDialog::OnApply)
   EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel)
   EVT_BUTTON(wxID_OK, wxDialog::OnOK)
   EVT_BUTTON(wxID_APPLY, wxDialog::OnApply)
   EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel)


@@ -46,7 +46,7 @@ END_EVENT_TABLE()
 
 wxDialog::wxDialog()
 {
 
 wxDialog::wxDialog()
 {

-       m_isShown = FALSE;
+      m_isShown = FALSE;

     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
 }
 
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
 }
 


@@ -57,26 +57,30 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
            long style,
            const wxString& name)
 {
            long style,
            const wxString& name)
 {

+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));

 
 

-  SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
-  

 
 

-  if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
+    if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )

         return FALSE;
 
         return FALSE;
 

-       MacCreateRealWindow( title , pos , size , MacRemoveBordersFromStyle(style)  , name ) ;
+    MacCreateRealWindow( title , pos , size , MacRemoveBordersFromStyle(style) & ~(wxYES|wxOK|wxNO|wxCANCEL) , name ) ;

 
 

-       m_macWindowBackgroundTheme = kThemeBrushDialogBackgroundActive ;
-  return TRUE;
+    m_macWindowBackgroundTheme = kThemeBrushDialogBackgroundActive ;
+    SetThemeWindowBackground( (WindowRef) m_macWindow , m_macWindowBackgroundTheme , false ) ;
+
+    return TRUE;

 }
 
 void wxDialog::SetModal(bool flag)
 {
 }
 
 void wxDialog::SetModal(bool flag)
 {

-  if ( flag )
+    if ( flag )

     {
         m_windowStyle |= wxDIALOG_MODAL;
 
         wxModelessWindows.DeleteObject(this);
     {
         m_windowStyle |= wxDIALOG_MODAL;
 
         wxModelessWindows.DeleteObject(this);

+#if TARGET_CARBON
+        SetWindowModality( (WindowRef) MacGetWindowRef() , kWindowModalityAppModal , NULL ) ;
+#endif

     }
     else
     {
     }
     else
     {


@@ -88,28 +92,27 @@ void wxDialog::SetModal(bool flag)
 
 wxDialog::~wxDialog()
 {
 
 wxDialog::~wxDialog()
 {

-       m_isBeingDeleted = TRUE ;
-  Show(FALSE);
+    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)
 {
 }
 
 // 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 || 
-      ( 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.
-               wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
-               cancelEvent.SetEventObject( this );
-               GetEventHandler()->ProcessEvent(cancelEvent);
+    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.
+        wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
+        cancelEvent.SetEventObject( this );
+        GetEventHandler()->ProcessEvent(cancelEvent);

 
 

-               return;
-  }
-  // We didn't process this event.
-  event.Skip();
+        return;
+    }
+    // We didn't process this event.
+    event.Skip();

 }
 
 bool wxDialog::IsModal() const
 }
 
 bool wxDialog::IsModal() const


@@ -123,8 +126,6 @@ bool wxDialog::IsModalShowing() const
     return wxModalDialogs.Find((wxDialog *)this) != NULL; // const_cast
 }
 
     return wxModalDialogs.Find((wxDialog *)this) != NULL; // const_cast
 }
 

-extern bool s_macIsInModalLoop ;
-

 bool wxDialog::Show(bool show)
 {
     if ( !wxDialogBase::Show(show) )
 bool wxDialog::Show(bool show)
 {
     if ( !wxDialogBase::Show(show) )


@@ -156,55 +157,48 @@ bool wxDialog::Show(bool show)
     return TRUE;
 }
 
     return TRUE;
 }
 

+#if !TARGET_CARBON
+extern bool s_macIsInModalLoop ;
+#endif
+

 void wxDialog::DoShowModal()
 {
     wxCHECK_RET( !IsModalShowing(), _T("DoShowModal() called twice") );
 
     wxModalDialogs.Append(this);
 
 void wxDialog::DoShowModal()
 {
     wxCHECK_RET( !IsModalShowing(), _T("DoShowModal() called twice") );
 
     wxModalDialogs.Append(this);
 

-       wxWindow *parent = GetParent();
-
-    // remember where the focus was
-    wxWindow *winFocus = FindFocus();
-    if ( !winFocus )
-    {
-        winFocus = parent;
-    }
-    if ( !winFocus )
+#if TARGET_CARBON
+    BeginAppModalStateForWindow(  (WindowRef) MacGetWindowRef()) ;
+#else
+    // TODO : test whether parent gets disabled
+    bool formerModal = s_macIsInModalLoop ;
+    s_macIsInModalLoop = true ;
+#endif
+    while ( IsModalShowing() )

     {
     {

-        winFocus = wxTheApp->GetTopWindow();
+        wxTheApp->MacDoOneEvent() ;
+        // calls process idle itself

     }
     }

-       // TODO : test whether parent gets disabled
-
-       bool formerModal = s_macIsInModalLoop ;
-       s_macIsInModalLoop = true ;
-
-       while ( IsModalShowing() )
-       {
-               while ( !wxTheApp->Pending() && wxTheApp->ProcessIdle() )
-               {
-               }
-               wxTheApp->MacDoOneEvent() ;
-       }
-       
-       s_macIsInModalLoop = formerModal ;

 
 

+#if TARGET_CARBON
+    EndAppModalStateForWindow( (WindowRef) MacGetWindowRef() ) ;
+#else

     // TODO probably reenable the parent window if any
     // TODO probably reenable the parent window if any

-
-    // and restore focus
-    if ( winFocus )
-    {
-        winFocus->SetFocus();
-    }
+    s_macIsInModalLoop = formerModal ;
+#endif

 }
 
 
 // Replacement for Show(TRUE) for modal dialogs - returns return code
 int wxDialog::ShowModal()
 {
 }
 
 
 // Replacement for Show(TRUE) for modal dialogs - returns return code
 int wxDialog::ShowModal()
 {

-  m_windowStyle |= wxDIALOG_MODAL;
-  Show(TRUE);
-  return GetReturnCode();
+    if ( !IsModal() )
+    {
+        SetModal(TRUE);
+    }
+
+    Show(TRUE);
+    return GetReturnCode();

 }
 
 // NB: this function (surprizingly) may be called for both modal and modeless
 }
 
 // NB: this function (surprizingly) may be called for both modal and modeless


@@ -216,7 +210,7 @@ void wxDialog::EndModal(int retCode)
 }
 
 // Standard buttons
 }
 
 // Standard buttons

-void wxDialog::OnOK(wxCommandEvent& event)
+void wxDialog::OnOK(wxCommandEvent& WXUNUSED(event))

 {
   if ( Validate() && TransferDataFromWindow() )
   {
 {
   if ( Validate() && TransferDataFromWindow() )
   {


@@ -224,19 +218,19 @@ void wxDialog::OnOK(wxCommandEvent& event)
   }
 }
 
   }
 }
 

-void wxDialog::OnApply(wxCommandEvent& event)
+void wxDialog::OnApply(wxCommandEvent& WXUNUSED(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)
+void wxDialog::OnCancel(wxCommandEvent& WXUNUSED(event))

 {
 {

-        EndModal(wxID_CANCEL);
+    EndModal(wxID_CANCEL);

 }
 
 }
 

-void wxDialog::OnCloseWindow(wxCloseEvent& event)
+void wxDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))

 {
     // We'll send a Cancel message by default,
     // which may close the dialog.
 {
     // We'll send a Cancel message by default,
     // which may close the dialog.


@@ -266,7 +260,7 @@ void wxDialog::OnCloseWindow(wxCloseEvent& event)
     closing.DeleteObject(this);
 }
 
     closing.DeleteObject(this);
 }
 

-void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& event)
+void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))

 {
   SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
   Refresh();
 {
   SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
   Refresh();