create stock GDI objects on demand; use const with GDI objects appropriately (patch...

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

diff --git a/src/mac/carbon/dialog.cpp b/src/mac/carbon/dialog.cpp
index 3e733e2f8d3828f0dcf72a3d52a0dd3a8046785b..402b749e7c15a25e5478bcd0f03b3c661686f8a1 100644 (file)
--- a/src/mac/carbon/dialog.cpp
+++ b/src/mac/carbon/dialog.cpp
@@ -19,10 +19,11 @@
 
 #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;
 
 IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
@@ -39,52 +40,65 @@ BEGIN_EVENT_TABLE(wxDialog, wxDialogBase)
   EVT_CLOSE(wxDialog::OnCloseWindow)
 END_EVENT_TABLE()
 
+
 void wxDialog::Init()
 {
     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_isModalStyle = true;
 
-        wxModelessWindows.DeleteObject(this);
+        wxModelessWindows.DeleteObject( this );
+
 #if TARGET_CARBON
-        SetWindowModality( (WindowRef) MacGetWindowRef() , kWindowModalityAppModal , NULL ) ;
+        SetWindowModality( (WindowRef)MacGetWindowRef(), kWindowModalityAppModal, NULL ) ;
 #endif
     }
     else
     {
         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
@@ -102,6 +116,7 @@ void wxDialog::OnCharHook(wxKeyEvent& event)
 
         return;
     }
+
     // We didn't process this event.
     event.Skip();
 }
@@ -121,16 +136,12 @@ 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 ( m_isModalStyle )
     {
@@ -140,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
@@ -155,7 +166,7 @@ extern bool s_macIsInModalLoop ;
 
 void wxDialog::DoShowModal()
 {
-    wxCHECK_RET( !IsModalShowing(), _T("DoShowModal() called twice") );
+    wxCHECK_RET( !IsModalShowing(), wxT("DoShowModal() called twice") );
 
     wxModalDialogs.Append(this);
 
@@ -168,6 +179,7 @@ void wxDialog::DoShowModal()
     bool formerModal = s_macIsInModalLoop ;
     s_macIsInModalLoop = true ;
 #endif
+
     while ( IsModalShowing() )
     {
         wxTheApp->MacDoOneEvent() ;
@@ -183,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 ( !m_isModalStyle )
-    {
-        SetModal(TRUE);
-    }
+        SetModal(true);
+
+    Show(true);
 
-    Show(TRUE);
     return GetReturnCode();
 }
 
@@ -200,7 +211,7 @@ int wxDialog::ShowModal()
 void wxDialog::EndModal(int retCode)
 {
     SetReturnCode(retCode);
-    Show(FALSE);
+    Show(false);
     SetModal(false);
 }
 
@@ -208,15 +219,14 @@ void wxDialog::EndModal(int retCode)
 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
 }