correct boundaries for carbon

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

diff --git a/src/mac/dialog.cpp b/src/mac/dialog.cpp
index 506e3399adb3cfdef236cc571b420b32fb5f90e7..f29ed3e59eab4d46b446f9f16aa155c56b24c0e4 100644 (file)
--- a/src/mac/dialog.cpp
+++ b/src/mac/dialog.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:    wxWindows licence
+// Licence:       wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -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,27 +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 ;
-       SetThemeWindowBackground( (WindowRef) m_macWindow , m_macWindowBackgroundTheme , false ) ;
-  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
     {


@@ -89,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


@@ -165,57 +167,38 @@ void wxDialog::DoShowModal()
 
     wxModalDialogs.Append(this);
 
 
     wxModalDialogs.Append(this);
 

-       wxWindow *parent = GetParent();
-
-    // remember where the focus was
-    wxWindow *winFocus = FindFocus();
-    if ( !winFocus )
-    {
-        winFocus = parent;
-    }
-    if ( !winFocus )
-    {
-        winFocus = wxTheApp->GetTopWindow();
-    }

 #if TARGET_CARBON
 #if TARGET_CARBON

-       BeginAppModalStateForWindow(  (WindowRef) MacGetWindowRef()) ;
+    BeginAppModalStateForWindow(  (WindowRef) MacGetWindowRef()) ;

 #else
 #else

-       // TODO : test whether parent gets disabled
-       bool formerModal = s_macIsInModalLoop ;
-       s_macIsInModalLoop = true ;
+    // TODO : test whether parent gets disabled
+    bool formerModal = s_macIsInModalLoop ;
+    s_macIsInModalLoop = true ;

 #endif
 #endif

-       while ( IsModalShowing() )
-       {
-               wxTheApp->MacDoOneEvent() ;
-               // calls process idle itself
-       }
-       
+    while ( IsModalShowing() )
+    {
+        wxTheApp->MacDoOneEvent() ;
+        // calls process idle itself
+    }
+

 #if TARGET_CARBON
 #if TARGET_CARBON

-       EndAppModalStateForWindow( (WindowRef) MacGetWindowRef() ) ;
+    EndAppModalStateForWindow( (WindowRef) MacGetWindowRef() ) ;

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

-       s_macIsInModalLoop = formerModal ;
+    s_macIsInModalLoop = formerModal ;

 #endif
 #endif

-
-
-    // and restore focus
-    if ( winFocus )
-    {
-        winFocus->SetFocus();
-    }

 }
 
 
 // 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()
 {

-       if ( !IsModal() )
-       {
-           SetModal(TRUE);
-       }
+    if ( !IsModal() )
+    {
+        SetModal(TRUE);
+    }

 
 

-       Show(TRUE);
-       return GetReturnCode();
+    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