wxCLOSE->wxCLOSE_BOX

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

diff --git a/src/mac/carbon/dialog.cpp b/src/mac/carbon/dialog.cpp
index 755ad0192ad4e19dde011648a22efd999218ba8c..b0daaad6850f69ae8d34b4e44b1db34cd61ed397 100644 (file)
--- a/src/mac/carbon/dialog.cpp
+++ b/src/mac/carbon/dialog.cpp
@@ -67,6 +67,7 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
        MacCreateRealWindow( title , pos , size , MacRemoveBordersFromStyle(style)  , name ) ;
 
        m_macWindowBackgroundTheme = kThemeBrushDialogBackgroundActive ;
+       SetThemeWindowBackground( (WindowRef) m_macWindow , m_macWindowBackgroundTheme , false ) ;
   return TRUE;
 }
 
@@ -123,8 +124,6 @@ bool wxDialog::IsModalShowing() const
     return wxModalDialogs.Find((wxDialog *)this) != NULL; // const_cast
 }
 
-extern bool s_macIsInModalLoop ;
-
 bool wxDialog::Show(bool show)
 {
     if ( !wxDialogBase::Show(show) )
@@ -156,6 +155,10 @@ bool wxDialog::Show(bool show)
     return TRUE;
 }
 
+#if !TARGET_CARBON
+extern bool s_macIsInModalLoop ;
+#endif
+
 void wxDialog::DoShowModal()
 {
     wxCHECK_RET( !IsModalShowing(), _T("DoShowModal() called twice") );
@@ -174,22 +177,26 @@ void wxDialog::DoShowModal()
     {
         winFocus = wxTheApp->GetTopWindow();
     }
+#if TARGET_CARBON
+       BeginAppModalStateForWindow(  (WindowRef) MacGetWindowRef()) ;
+#else
        // TODO : test whether parent gets disabled
-
        bool formerModal = s_macIsInModalLoop ;
        s_macIsInModalLoop = true ;
-
+#endif
        while ( IsModalShowing() )
        {
-               while ( !wxTheApp->Pending() && wxTheApp->ProcessIdle() )
-               {
-               }
                wxTheApp->MacDoOneEvent() ;
+               // calls process idle itself
        }
        
+#if TARGET_CARBON
+       EndAppModalStateForWindow( (WindowRef) MacGetWindowRef() ) ;
+#else
+    // TODO probably reenable the parent window if any
        s_macIsInModalLoop = formerModal ;
+#endif
 
-    // TODO probably reenable the parent window if any
 
     // and restore focus
     if ( winFocus )
@@ -202,9 +209,13 @@ void wxDialog::DoShowModal()
 // 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
@@ -216,7 +227,7 @@ void wxDialog::EndModal(int retCode)
 }
 
 // Standard buttons
-void wxDialog::OnOK(wxCommandEvent& event)
+void wxDialog::OnOK(wxCommandEvent& WXUNUSED(event))
 {
   if ( Validate() && TransferDataFromWindow() )
   {
@@ -224,19 +235,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
 }
 
-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.
@@ -266,7 +277,7 @@ void wxDialog::OnCloseWindow(wxCloseEvent& event)
     closing.DeleteObject(this);
 }
 
-void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& event)
+void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))
 {
   SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
   Refresh();