added const for Mac OS X compilation

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

diff --git a/src/mac/carbon/dialog.cpp b/src/mac/carbon/dialog.cpp
index bf3cae5e352be74e0494d910408c79df3bdbac97..760c07680a91543be3bb019f8eba670f2e08b247 100644 (file)
--- a/src/mac/carbon/dialog.cpp
+++ b/src/mac/carbon/dialog.cpp
@@ -19,6 +19,8 @@
 #include "wx/app.h"
 #include "wx/settings.h"
 
 #include "wx/app.h"
 #include "wx/settings.h"
 

+#include <wx/mac/uma.h>
+

 // Lists to keep track of windows, so we can disable/enable them
 // for modal dialogs
 wxList wxModalDialogs;
 // Lists to keep track of windows, so we can disable/enable them
 // for modal dialogs
 wxList wxModalDialogs;


@@ -29,6 +31,7 @@ extern wxList wxPendingDelete;
 IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxPanel)
 
 BEGIN_EVENT_TABLE(wxDialog, wxPanel)
 IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxPanel)
 
 BEGIN_EVENT_TABLE(wxDialog, wxPanel)

+       EVT_SIZE(wxDialog::OnSize)

   EVT_BUTTON(wxID_OK, wxDialog::OnOK)
   EVT_BUTTON(wxID_APPLY, wxDialog::OnApply)
   EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel)
   EVT_BUTTON(wxID_OK, wxDialog::OnOK)
   EVT_BUTTON(wxID_APPLY, wxDialog::OnApply)
   EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel)


@@ -41,6 +44,7 @@ END_EVENT_TABLE()
 
 wxDialog::wxDialog()
 {
 
 wxDialog::wxDialog()
 {

+       m_isShown = FALSE;

     SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
 }
 
     SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
 }
 


@@ -51,10 +55,8 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
            long style,
            const wxString& name)
 {
            long style,
            const wxString& name)
 {

-  m_windowStyle = style;

 
   SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
 
   SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));

-  SetName(name);

   
   if (!parent)
     wxTopLevelWindows.Append(this);
   
   if (!parent)
     wxTopLevelWindows.Append(this);


@@ -66,31 +68,37 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
   else
        m_windowId = id;
 
   else
        m_windowId = id;
 

-  // TODO: create dialog
+       MacCreateRealWindow( title , pos , size , MacRemoveBordersFromStyle(style)  , name ) ;

 
 

-  return FALSE;
+       m_macWindowData->m_macWindowBackgroundTheme = kThemeBrushDialogBackgroundActive ;
+  return TRUE;

 }
 
 void wxDialog::SetModal(bool flag)
 {
 }
 
 void wxDialog::SetModal(bool flag)
 {

-       if ( flag )
-               m_windowStyle |= wxDIALOG_MODAL ;
-       else
-               if ( m_windowStyle & wxDIALOG_MODAL )
-                       m_windowStyle -= wxDIALOG_MODAL ;
-  
-  wxModelessWindows.DeleteObject(this);
-  if (!flag)
-    wxModelessWindows.Append(this);
+  if ( flag )
+    {
+        m_windowStyle |= wxDIALOG_MODAL;
+
+        wxModelessWindows.DeleteObject(this);
+    }
+    else
+    {
+        m_windowStyle &= ~wxDIALOG_MODAL;
+
+        wxModelessWindows.Append(this);
+    }

 }
 
 wxDialog::~wxDialog()
 {
 }
 
 wxDialog::~wxDialog()
 {

-    // TODO
+       m_isBeingDeleted = TRUE ;

     wxTopLevelWindows.DeleteObject(this);
 
     wxTopLevelWindows.DeleteObject(this);
 

-    if ( (GetWindowStyleFlag() & wxDIALOG_MODAL) != wxDIALOG_MODAL )
-      wxModelessWindows.DeleteObject(this);
+       Show(FALSE);
+
+    if ( !IsModal() )
+       wxModelessWindows.DeleteObject(this);

 
     // If this is the last top-level window, exit.
     if (wxTheApp && (wxTopLevelWindows.Number() == 0))
 
     // If this is the last top-level window, exit.
     if (wxTheApp && (wxTopLevelWindows.Number() == 0))


@@ -99,7 +107,7 @@ wxDialog::~wxDialog()
 
       if (wxTheApp->GetExitOnFrameDelete())
       {
 
       if (wxTheApp->GetExitOnFrameDelete())
       {

-         // TODO: exit
+               wxTheApp->ExitMainLoop() ;

       }
     }
 }
       }
     }
 }


@@ -123,118 +131,147 @@ void wxDialog::OnCharHook(wxKeyEvent& event)
 
 void wxDialog::Iconize(bool WXUNUSED(iconize))
 {
 
 void wxDialog::Iconize(bool WXUNUSED(iconize))
 {

-    // TODO
+       // mac dialogs cannot be iconized

 }
 
 bool wxDialog::IsIconized() const
 {
 }
 
 bool wxDialog::IsIconized() const
 {

-    // TODO
+       // mac dialogs cannot be iconized

     return FALSE;
 }
 
     return FALSE;
 }
 

-void wxDialog::SetClientSize(int width, int height)
+void wxDialog::DoSetClientSize(int width, int height)

 {
 {

-    // TODO
+       wxWindow::DoSetClientSize( width , height ) ;

 }
 
 }
 

-void wxDialog::GetPosition(int *x, int *y) const
+void wxDialog::DoGetPosition(int *x, int *y) const

 {
 {

-    // TODO
+       wxWindow::DoGetPosition( x , y ) ;

 }
 
 }
 

-bool wxDialog::Show(bool show)
+bool wxDialog::IsModal() const

 {
 {

-    // TODO
-    return FALSE;
+    return (GetWindowStyleFlag() & wxDIALOG_MODAL) != 0;

 }
 
 }
 

-void wxDialog::SetTitle(const wxString& title)
+
+bool wxDialog::IsModalShowing() const

 {
 {

-    // TODO
+    return wxModalDialogs.Find((wxDialog *)this) != NULL; // const_cast

 }
 
 }
 

-wxString wxDialog::GetTitle() const
+
+extern bool s_macIsInModalLoop ;
+
+bool wxDialog::Show(bool show)

 {
 {

-    // TODO
-    return wxString("");
+    if ( !wxDialogBase::Show(show) )
+    {
+        // nothing to do
+        return FALSE;
+    }
+
+    if ( show )
+    {
+        // usually will result in TransferDataToWindow() being called
+        InitDialog();
+    }
+
+    if ( IsModal() )
+    {
+        if ( show )
+        {
+            DoShowModal();
+        }
+        else // end of modal dialog
+        {
+            // this will cause IsModalShowing() return FALSE and our local
+            // message loop will terminate
+            wxModalDialogs.DeleteObject(this);
+        }
+    }
+
+    return TRUE;

 }
 
 }
 

-void wxDialog::Centre(int direction)
+void wxDialog::DoShowModal()

 {
 {

-  int x_offset,y_offset ;
-  int display_width, display_height;
-  int  width, height, x, y;
-  wxWindow *parent = GetParent();
-  if ((direction & wxCENTER_FRAME) && parent)
-  {
-      parent->GetPosition(&x_offset,&y_offset) ;
-      parent->GetSize(&display_width,&display_height) ;
-  }
-  else
-  {
-    wxDisplaySize(&display_width, &display_height);
-    x_offset = 0 ;
-    y_offset = 0 ;
-  }
+    wxCHECK_RET( !IsModalShowing(), _T("DoShowModal() called twice") );
+
+    wxModalDialogs.Append(this);
+
+       wxWindow *parent = GetParent();
+
+    // remember where the focus was
+    wxWindow *winFocus = FindFocus();
+    if ( !winFocus )
+    {
+        winFocus = parent;
+    }
+    if ( !winFocus )
+    {
+        winFocus = wxTheApp->GetTopWindow();
+    }
+       // TODO : test whether parent gets disabled

 
 

-  GetSize(&width, &height);
-  GetPosition(&x, &y);
+       s_macIsInModalLoop = true ;
+
+       while ( IsModalShowing() )
+       {
+               while ( !wxTheApp->Pending() && wxTheApp->ProcessIdle() )
+               {
+               }
+               wxTheApp->MacDoOneEvent() ;
+       }
+       
+       s_macIsInModalLoop = false ;

 
 

-  if (direction & wxHORIZONTAL)
-    x = (int)((display_width - width)/2);
-  if (direction & wxVERTICAL)
-    y = (int)((display_height - height)/2);
+    // TODO probably reenable the parent window if any

 
 

-  SetSize(x+x_offset, y+y_offset, width, height);
+    // 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()
 {

-    m_windowStyle |= wxDIALOG_MODAL;
-    // TODO: modal showing
-       Show(TRUE);
-       return GetReturnCode();
+  m_windowStyle |= wxDIALOG_MODAL;
+  Show(TRUE);
+  return GetReturnCode();

 }
 
 }
 

+// NB: this function (surprizingly) may be called for both modal and modeless
+//     dialogs and should work for both of them

 void wxDialog::EndModal(int retCode)
 {
 void wxDialog::EndModal(int retCode)
 {

-       SetReturnCode(retCode);
-    // TODO modal un-showing
-       Show(FALSE);
+  SetReturnCode(retCode);
+  Show(FALSE);

 }
 
 // Standard buttons
 void wxDialog::OnOK(wxCommandEvent& event)
 {
 }
 
 // Standard buttons
 void wxDialog::OnOK(wxCommandEvent& event)
 {

-       if ( Validate() && TransferDataFromWindow() )
-       {
-        if ( IsModal() )
-            EndModal(wxID_OK);
-        else
-        {
-                   SetReturnCode(wxID_OK);
-                   this->Show(FALSE);
-        }
-       }
+  if ( Validate() && TransferDataFromWindow() )
+  {
+      EndModal(wxID_OK);
+  }

 }
 
 void wxDialog::OnApply(wxCommandEvent& event)
 {
 }
 
 void wxDialog::OnApply(wxCommandEvent& event)
 {

-       if (Validate())
-               TransferDataFromWindow();
-       // TODO probably need to disable the Apply button until things change again
+  if (Validate())
+    TransferDataFromWindow();
+  // TODO probably need to disable the Apply button until things change again

 }
 
 void wxDialog::OnCancel(wxCommandEvent& event)
 {
 }
 
 void wxDialog::OnCancel(wxCommandEvent& event)
 {

-    if ( IsModal() )

         EndModal(wxID_CANCEL);
         EndModal(wxID_CANCEL);

-    else
-    {
-        SetReturnCode(wxID_CANCEL);
-               this->Show(FALSE);
-    }

 }
 
 void wxDialog::OnCloseWindow(wxCloseEvent& event)
 }
 
 void wxDialog::OnCloseWindow(wxCloseEvent& event)


@@ -254,12 +291,12 @@ void wxDialog::OnCloseWindow(wxCloseEvent& event)
     // The default OnCancel (above) simply ends a modal dialog, and hides a modeless dialog.
 
     static wxList closing;
     // The default OnCancel (above) simply ends a modal dialog, and hides a modeless dialog.
 
     static wxList closing;

-    
+

     if ( closing.Member(this) )
         return;
     if ( closing.Member(this) )
         return;

-    
+

     closing.Append(this);
     closing.Append(this);

-    
+

     wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
     cancelEvent.SetEventObject( this );
     GetEventHandler()->ProcessEvent(cancelEvent); // This may close the dialog
     wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
     cancelEvent.SetEventObject( this );
     GetEventHandler()->ProcessEvent(cancelEvent); // This may close the dialog


@@ -270,7 +307,9 @@ void wxDialog::OnCloseWindow(wxCloseEvent& event)
 // Destroy the window (delayed, if a managed window)
 bool wxDialog::Destroy()
 {
 // Destroy the window (delayed, if a managed window)
 bool wxDialog::Destroy()
 {

-  if (!wxPendingDelete.Member(this))
+    wxCHECK_MSG( !wxPendingDelete.Member(this), FALSE,
+                 _T("wxDialog destroyed twice") );
+

     wxPendingDelete.Append(this);
   return TRUE;
 }
     wxPendingDelete.Append(this);
   return TRUE;
 }


@@ -281,6 +320,3 @@ void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& event)
   Refresh();
 }
 
   Refresh();
 }
 

-void wxDialog::Fit()
-{
-}