X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fd04970ab45eb2f392af48b71aa9ecd5d4b1c8c2..e8c1be041f43e843e0e57cb1591d38664e98d43c:/src/mac/carbon/dialog.cpp

diff --git a/src/mac/carbon/dialog.cpp b/src/mac/carbon/dialog.cpp
index 830ab7f875..3e812a6c94 100644
--- a/src/mac/carbon/dialog.cpp
+++ b/src/mac/carbon/dialog.cpp
@@ -9,10 +9,6 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "dialog.h"
-#endif
-
 #include "wx/wxprec.h"
 
 #include "wx/dialog.h"
@@ -60,10 +56,14 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
     // 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;
+    if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style & ~(wxYES|wxOK|wxNO /*|wxCANCEL*/) , name) )
+        return false;
 
-    return TRUE;
+    HIViewRef growBoxRef = 0 ;
+    OSStatus err = HIViewFindByID( HIViewGetRoot( (WindowRef) m_macWindow ) , kHIViewWindowGrowBoxID , &growBoxRef );
+    if ( err == noErr && growBoxRef != 0 )
+        HIGrowBoxViewSetTransparent( growBoxRef , true ) ;
+    return true;
 }
 
 void wxDialog::SetModal(bool flag)
@@ -87,11 +87,11 @@ void wxDialog::SetModal(bool flag)
 
 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 ||
@@ -112,7 +112,8 @@ void wxDialog::OnCharHook(wxKeyEvent& event)
 
 bool wxDialog::IsModal() const
 {
-    return m_isModalStyle;
+    return wxModalDialogs.Find((wxDialog *)this) != NULL; // const_cast
+    //    return m_isModalStyle;
 }
 
 
@@ -126,7 +127,7 @@ bool wxDialog::Show(bool show)
     if ( !wxDialogBase::Show(show) )
     {
         // nothing to do
-        return FALSE;
+        return false;
     }
 
     if ( show )
@@ -135,7 +136,7 @@ bool wxDialog::Show(bool show)
         InitDialog();
     }
 
-    if ( IsModal() )
+    if ( m_isModalStyle )
     {
         if ( show )
         {
@@ -143,13 +144,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
@@ -186,15 +187,13 @@ 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();
 }
 
@@ -202,23 +201,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
 }