default button on older systems was not shown with OK, but empty, resulting in wxID_C...

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

diff --git a/src/mac/carbon/dialog.cpp b/src/mac/carbon/dialog.cpp
index 9881fac0bdeac636ea22c687437931dce80b8286..402b749e7c15a25e5478bcd0f03b3c661686f8a1 100644 (file)
--- a/src/mac/carbon/dialog.cpp
+++ b/src/mac/carbon/dialog.cpp
@@ -9,9 +9,7 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "dialog.h"
-#endif
+#include "wx/wxprec.h"
 
 #include "wx/dialog.h"
 #include "wx/utils.h"
@@ -21,13 +19,13 @@
 
 #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
+
 extern wxList wxPendingDelete;
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
 
 BEGIN_EVENT_TABLE(wxDialog, wxDialogBase)
@@ -42,57 +40,68 @@ BEGIN_EVENT_TABLE(wxDialog, wxDialogBase)
   EVT_CLOSE(wxDialog::OnCloseWindow)
 END_EVENT_TABLE()
 
-#endif
 
-wxDialog::wxDialog()
+void wxDialog::Init()
 {
-    m_isShown = FALSE;
+    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 )
 {
-    SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG);
+    SetExtraStyle( GetExtraStyle() | wxTOPLEVEL_EX_DIALOG );
 
-    // All dialogs should really have this style
+    // All dialogs should really have this style...
     style |= wxTAB_TRAVERSAL;
 
-    if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style & ~(wxYES|wxOK|wxNO|wxCANCEL) , name) )
-        return FALSE;
+    // ...but not these styles
+    style &= ~(wxYES | wxOK | wxNO); // | wxCANCEL
+
+    if ( !wxTopLevelWindow::Create( parent, id, title, pos, size, style, name ) )
+        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
 
-    return TRUE;
+    return true;
 }
 
-void wxDialog::SetModal(bool flag)
+void wxDialog::SetModal( bool flag )
 {
     if ( flag )
     {
-        m_windowStyle |= wxDIALOG_MODAL;
+        m_isModalStyle = true;
+
+        wxModelessWindows.DeleteObject( this );
 
-        wxModelessWindows.DeleteObject(this);
 #if TARGET_CARBON
-        SetWindowModality( (WindowRef) MacGetWindowRef() , kWindowModalityAppModal , NULL ) ;
+        SetWindowModality( (WindowRef)MacGetWindowRef(), kWindowModalityAppModal, NULL ) ;
 #endif
     }
     else
     {
-        m_windowStyle &= ~wxDIALOG_MODAL;
+        m_isModalStyle = false;
 
-        wxModelessWindows.Append(this);
+        wxModelessWindows.Append( this );
     }
 }
 
 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
+// 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 ||
@@ -107,13 +116,15 @@ void wxDialog::OnCharHook(wxKeyEvent& event)
 
         return;
     }
+
     // We didn't process this event.
     event.Skip();
 }
 
 bool wxDialog::IsModal() const
 {
-    return (GetWindowStyleFlag() & wxDIALOG_MODAL) != 0;
+    return wxModalDialogs.Find((wxDialog *)this) != NULL; // const_cast
+    //    return m_isModalStyle;
 }
 
 
@@ -125,18 +136,14 @@ bool wxDialog::IsModalShowing() const
 bool wxDialog::Show(bool show)
 {
     if ( !wxDialogBase::Show(show) )
-    {
         // nothing to do
-        return FALSE;
-    }
+        return false;
 
     if ( show )
-    {
         // usually will result in TransferDataToWindow() being called
         InitDialog();
-    }
 
-    if ( IsModal() )
+    if ( m_isModalStyle )
     {
         if ( show )
         {
@@ -144,13 +151,13 @@ bool wxDialog::Show(bool show)
         }
         else // end of modal dialog
         {
-            // this will cause IsModalShowing() return FALSE and our local
+            // this will cause IsModalShowing() return false and our local
             // message loop will terminate
             wxModalDialogs.DeleteObject(this);
         }
     }
 
-    return TRUE;
+    return true;
 }
 
 #if !TARGET_CARBON
@@ -159,17 +166,20 @@ extern bool s_macIsInModalLoop ;
 
 void wxDialog::DoShowModal()
 {
-    wxCHECK_RET( !IsModalShowing(), _T("DoShowModal() called twice") );
+    wxCHECK_RET( !IsModalShowing(), wxT("DoShowModal() called twice") );
 
     wxModalDialogs.Append(this);
 
+    SetFocus() ;
+    
 #if TARGET_CARBON
-//    BeginAppModalStateForWindow(  (WindowRef) MacGetWindowRef()) ;
+    BeginAppModalStateForWindow(  (WindowRef) MacGetWindowRef()) ;
 #else
     // TODO : test whether parent gets disabled
     bool formerModal = s_macIsInModalLoop ;
     s_macIsInModalLoop = true ;
 #endif
+
     while ( IsModalShowing() )
     {
         wxTheApp->MacDoOneEvent() ;
@@ -177,7 +187,7 @@ void wxDialog::DoShowModal()
     }
 
 #if TARGET_CARBON
-//    EndAppModalStateForWindow( (WindowRef) MacGetWindowRef() ) ;
+    EndAppModalStateForWindow( (WindowRef) MacGetWindowRef() ) ;
 #else
     // TODO probably reenable the parent window if any
     s_macIsInModalLoop = formerModal ;
@@ -185,15 +195,14 @@ void wxDialog::DoShowModal()
 }
 
 
-// Replacement for Show(TRUE) for modal dialogs - returns return code
+// Replacement for Show(true) for modal dialogs - returns return code
 int wxDialog::ShowModal()
 {
-    if ( !IsModal() )
-    {
-        SetModal(TRUE);
-    }
+    if ( !m_isModalStyle )
+        SetModal(true);
+
+    Show(true);
 
-    Show(TRUE);
     return GetReturnCode();
 }
 
@@ -201,23 +210,23 @@ int wxDialog::ShowModal()
 //     dialogs and should work for both of them
 void wxDialog::EndModal(int retCode)
 {
-  SetReturnCode(retCode);
-  Show(FALSE);
+    SetReturnCode(retCode);
+    Show(false);
+    SetModal(false);
 }
 
 // Standard buttons
 void wxDialog::OnOK(wxCommandEvent& WXUNUSED(event))
 {
   if ( Validate() && TransferDataFromWindow() )
-  {
       EndModal(wxID_OK);
-  }
 }
 
 void wxDialog::OnApply(wxCommandEvent& WXUNUSED(event))
 {
   if (Validate())
-    TransferDataFromWindow();
+      TransferDataFromWindow();
+
   // TODO probably need to disable the Apply button until things change again
 }