simplify OnActivate menubar install code

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

diff --git a/src/mac/carbon/dialog.cpp b/src/mac/carbon/dialog.cpp
index b0daaad6850f69ae8d34b4e44b1db34cd61ed397..402b749e7c15a25e5478bcd0f03b3c661686f8a1 100644 (file)
--- a/src/mac/carbon/dialog.cpp
+++ b/src/mac/carbon/dialog.cpp
@@ -1,17 +1,15 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        dialog.cpp
 // Purpose:     wxDialog class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        dialog.cpp
 // Purpose:     wxDialog class

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:       wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "dialog.h"
-#endif
+#include "wx/wxprec.h"

 
 #include "wx/dialog.h"
 #include "wx/utils.h"
 
 #include "wx/dialog.h"
 #include "wx/utils.h"


@@ -21,13 +19,13 @@
 
 #include "wx/mac/uma.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;

-//wxList wxModelessWindows;  // Frames and modeless dialogs
+

 extern wxList wxPendingDelete;
 
 extern wxList wxPendingDelete;
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
 
 BEGIN_EVENT_TABLE(wxDialog, wxDialogBase)
 IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
 
 BEGIN_EVENT_TABLE(wxDialog, wxDialogBase)


@@ -42,80 +40,91 @@ BEGIN_EVENT_TABLE(wxDialog, wxDialogBase)
   EVT_CLOSE(wxDialog::OnCloseWindow)
 END_EVENT_TABLE()
 
   EVT_CLOSE(wxDialog::OnCloseWindow)
 END_EVENT_TABLE()
 

-#endif

 
 

-wxDialog::wxDialog()
+void wxDialog::Init()

 {
 {

-       m_isShown = FALSE;
-    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
+    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 );
+
+    // All dialogs should really have this style...
+    style |= wxTAB_TRAVERSAL;
+
+    // ...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

 
 

-  SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
-  
-
-  if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
-        return FALSE;
-
-       MacCreateRealWindow( title , pos , size , MacRemoveBordersFromStyle(style)  , name ) ;
-
-       m_macWindowBackgroundTheme = kThemeBrushDialogBackgroundActive ;
-       SetThemeWindowBackground( (WindowRef) m_macWindow , m_macWindowBackgroundTheme , false ) ;
-  return TRUE;
+    return true;

 }
 
 }
 

-void wxDialog::SetModal(bool flag)
+void wxDialog::SetModal( bool flag )

 {
 {

-  if ( flag )
+    if ( flag )

     {
     {

-        m_windowStyle |= wxDIALOG_MODAL;
+        m_isModalStyle = true;
+
+        wxModelessWindows.DeleteObject( this );

 
 

-        wxModelessWindows.DeleteObject(this);
+#if TARGET_CARBON
+        SetWindowModality( (WindowRef)MacGetWindowRef(), kWindowModalityAppModal, NULL ) ;
+#endif

     }
     else
     {
     }
     else
     {

-        m_windowStyle &= ~wxDIALOG_MODAL;
+        m_isModalStyle = false;

 
 

-        wxModelessWindows.Append(this);
+        wxModelessWindows.Append( this );

     }
 }
 
 wxDialog::~wxDialog()
 {
     }
 }
 
 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)
 {
 void wxDialog::OnCharHook(wxKeyEvent& event)
 {

-  if (
-    ( event.m_keyCode == WXK_ESCAPE || 
-      ( event.m_keyCode == '.' && event.MetaDown() ) )
-     && FindWindow(wxID_CANCEL) )
-  {
-               // Behaviour changed in 2.0: we'll send a Cancel message
-               // to the dialog instead of Close.
-               wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
-               cancelEvent.SetEventObject( this );
-               GetEventHandler()->ProcessEvent(cancelEvent);
-
-               return;
-  }
-  // We didn't process this event.
-  event.Skip();
+    if (( event.m_keyCode == WXK_ESCAPE ||
+        ( event.m_keyCode == '.' && event.MetaDown() ) )
+        && FindWindow(wxID_CANCEL) )
+    {
+        // Behaviour changed in 2.0: we'll send a Cancel message
+        // to the dialog instead of Close.
+        wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
+        cancelEvent.SetEventObject( this );
+        GetEventHandler()->ProcessEvent(cancelEvent);
+
+        return;
+    }
+
+    // We didn't process this event.
+    event.Skip();

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

-    return (GetWindowStyleFlag() & wxDIALOG_MODAL) != 0;
+    return wxModalDialogs.Find((wxDialog *)this) != NULL; // const_cast
+    //    return m_isModalStyle;

 }
 
 
 }
 
 


@@ -127,18 +136,14 @@ bool wxDialog::IsModalShowing() const
 bool wxDialog::Show(bool show)
 {
     if ( !wxDialogBase::Show(show) )
 bool wxDialog::Show(bool show)
 {
     if ( !wxDialogBase::Show(show) )

-    {

         // nothing to do
         // nothing to do

-        return FALSE;
-    }
+        return false;

 
     if ( show )
 
     if ( show )

-    {

         // usually will result in TransferDataToWindow() being called
         InitDialog();
         // usually will result in TransferDataToWindow() being called
         InitDialog();

-    }

 
 

-    if ( IsModal() )
+    if ( m_isModalStyle )

     {
         if ( show )
         {
     {
         if ( show )
         {


@@ -146,13 +151,13 @@ bool wxDialog::Show(bool show)
         }
         else // end of modal dialog
         {
         }
         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);
         }
     }
 
             // message loop will terminate
             wxModalDialogs.DeleteObject(this);
         }
     }
 

-    return TRUE;
+    return true;

 }
 
 #if !TARGET_CARBON
 }
 
 #if !TARGET_CARBON


@@ -161,84 +166,67 @@ extern bool s_macIsInModalLoop ;
 
 void wxDialog::DoShowModal()
 {
 
 void wxDialog::DoShowModal()
 {

-    wxCHECK_RET( !IsModalShowing(), _T("DoShowModal() called twice") );
+    wxCHECK_RET( !IsModalShowing(), wxT("DoShowModal() called twice") );

 
     wxModalDialogs.Append(this);
 
 
     wxModalDialogs.Append(this);
 

-       wxWindow *parent = GetParent();
-
-    // remember where the focus was
-    wxWindow *winFocus = FindFocus();
-    if ( !winFocus )
-    {
-        winFocus = parent;
-    }
-    if ( !winFocus )
-    {
-        winFocus = wxTheApp->GetTopWindow();
-    }
+    SetFocus() ;
+    

 #if TARGET_CARBON
 #if TARGET_CARBON

-       BeginAppModalStateForWindow(  (WindowRef) MacGetWindowRef()) ;
+    BeginAppModalStateForWindow(  (WindowRef) MacGetWindowRef()) ;

 #else
 #else

-       // TODO : test whether parent gets disabled
-       bool formerModal = s_macIsInModalLoop ;
-       s_macIsInModalLoop = true ;
+    // TODO : test whether parent gets disabled
+    bool formerModal = s_macIsInModalLoop ;
+    s_macIsInModalLoop = true ;

 #endif
 #endif

-       while ( IsModalShowing() )
-       {
-               wxTheApp->MacDoOneEvent() ;
-               // calls process idle itself
-       }
-       
+
+    while ( IsModalShowing() )
+    {
+        wxTheApp->MacDoOneEvent() ;
+        // calls process idle itself
+    }
+

 #if TARGET_CARBON
 #if TARGET_CARBON

-       EndAppModalStateForWindow( (WindowRef) MacGetWindowRef() ) ;
+    EndAppModalStateForWindow( (WindowRef) MacGetWindowRef() ) ;

 #else
     // TODO probably reenable the parent window if any
 #else
     // TODO probably reenable the parent window if any

-       s_macIsInModalLoop = formerModal ;
+    s_macIsInModalLoop = formerModal ;

 #endif
 #endif

-
-
-    // and restore focus
-    if ( winFocus )
-    {
-        winFocus->SetFocus();
-    }

 }
 
 
 }
 
 

-// Replacement for Show(TRUE) for modal dialogs - returns return code
+// Replacement for Show(true) for modal dialogs - returns return code

 int wxDialog::ShowModal()
 {
 int wxDialog::ShowModal()
 {

-       if ( !IsModal() )
-       {
-           SetModal(TRUE);
-       }
+    if ( !m_isModalStyle )
+        SetModal(true);

 
 

-       Show(TRUE);
-       return GetReturnCode();
+    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)
 {
 }
 
 // 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)
 {

-  SetReturnCode(retCode);
-  Show(FALSE);
+    SetReturnCode(retCode);
+    Show(false);
+    SetModal(false);

 }
 
 // Standard buttons
 void wxDialog::OnOK(wxCommandEvent& WXUNUSED(event))
 {
   if ( Validate() && TransferDataFromWindow() )
 }
 
 // Standard buttons
 void wxDialog::OnOK(wxCommandEvent& WXUNUSED(event))
 {
   if ( Validate() && TransferDataFromWindow() )

-  {

       EndModal(wxID_OK);
       EndModal(wxID_OK);

-  }

 }
 
 void wxDialog::OnApply(wxCommandEvent& WXUNUSED(event))
 {
   if (Validate())
 }
 
 void wxDialog::OnApply(wxCommandEvent& WXUNUSED(event))
 {
   if (Validate())

-    TransferDataFromWindow();
+      TransferDataFromWindow();
+

   // TODO probably need to disable the Apply button until things change again
 }
 
   // TODO probably need to disable the Apply button until things change again
 }