MPThread implementation by AJ Lavin

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

diff --git a/src/mac/carbon/dialog.cpp b/src/mac/carbon/dialog.cpp
index cab8d1906c609fb827a1cb7879478ace7f490f46..af14cbc258062e4d719be4deb22e88d70c767c1e 100644 (file)
--- a/src/mac/carbon/dialog.cpp
+++ b/src/mac/carbon/dialog.cpp
@@ -44,10 +44,9 @@ END_EVENT_TABLE()
 
 #endif
 
 
 #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,
 }
 
 bool wxDialog::Create(wxWindow *parent, wxWindowID id,


@@ -57,16 +56,13 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
            long style,
            const wxString& name)
 {
            long style,
            const wxString& name)
 {

-    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
-    
-    
-    if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
+    SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG);
+
+    // 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;
         return FALSE;

-    
-    MacCreateRealWindow( title , pos , size , MacRemoveBordersFromStyle(style)  , name ) ;
-    
-    m_macWindowBackgroundTheme = kThemeBrushDialogBackgroundActive ;
-    SetThemeWindowBackground( (WindowRef) m_macWindow , m_macWindowBackgroundTheme , false ) ;

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -75,8 +71,8 @@ void wxDialog::SetModal(bool flag)
 {
     if ( flag )
     {
 {
     if ( flag )
     {

-        m_windowStyle |= wxDIALOG_MODAL;
-        
+        m_isModalStyle = true;
+

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


@@ -84,22 +80,22 @@ void wxDialog::SetModal(bool flag)
     }
     else
     {
     }
     else
     {

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

         wxModelessWindows.Append(this);
     }
 }
 
 wxDialog::~wxDialog()
 {
         wxModelessWindows.Append(this);
     }
 }
 
 wxDialog::~wxDialog()
 {

-    m_isBeingDeleted = TRUE ;
+    m_isBeingDeleted = TRUE;

     Show(FALSE);
 }
 
 // By default, pressing escape cancels the dialog , on mac command-stop does the same thing
 void wxDialog::OnCharHook(wxKeyEvent& event)
 {
     Show(FALSE);
 }
 
 // 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 || 
+    if (( event.m_keyCode == WXK_ESCAPE ||

         ( event.m_keyCode == '.' && event.MetaDown() ) )
         && FindWindow(wxID_CANCEL) )
     {
         ( event.m_keyCode == '.' && event.MetaDown() ) )
         && FindWindow(wxID_CANCEL) )
     {


@@ -108,7 +104,7 @@ void wxDialog::OnCharHook(wxKeyEvent& event)
         wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
         cancelEvent.SetEventObject( this );
         GetEventHandler()->ProcessEvent(cancelEvent);
         wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
         cancelEvent.SetEventObject( this );
         GetEventHandler()->ProcessEvent(cancelEvent);

-        
+

         return;
     }
     // We didn't process this event.
         return;
     }
     // We didn't process this event.


@@ -117,7 +113,7 @@ void wxDialog::OnCharHook(wxKeyEvent& event)
 
 bool wxDialog::IsModal() const
 {
 
 bool wxDialog::IsModal() const
 {

-    return (GetWindowStyleFlag() & wxDIALOG_MODAL) != 0;
+    return m_isModalStyle;

 }
 
 
 }
 
 


@@ -167,20 +163,8 @@ void wxDialog::DoShowModal()
 
     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();
-    }

 #if TARGET_CARBON
 #if TARGET_CARBON

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

 #else
     // TODO : test whether parent gets disabled
     bool formerModal = s_macIsInModalLoop ;
 #else
     // TODO : test whether parent gets disabled
     bool formerModal = s_macIsInModalLoop ;


@@ -191,20 +175,13 @@ void wxDialog::DoShowModal()
         wxTheApp->MacDoOneEvent() ;
         // calls process idle itself
     }
         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
     s_macIsInModalLoop = formerModal ;
 #endif
 #else
     // TODO probably reenable the parent window if any
     s_macIsInModalLoop = formerModal ;
 #endif

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

 }
 
 
 }