docs and example for wxDC::DrawPolyPolygon() (patch 882189)

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

diff --git a/src/mac/carbon/dialog.cpp b/src/mac/carbon/dialog.cpp
index cab8d1906c609fb827a1cb7879478ace7f490f46..f29ed3e59eab4d46b446f9f16aa155c56b24c0e4 100644 (file)
--- a/src/mac/carbon/dialog.cpp
+++ b/src/mac/carbon/dialog.cpp
@@ -58,13 +58,13 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
            const wxString& name)
 {
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
            const wxString& name)
 {
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));

-    
-    
+
+

     if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
         return FALSE;
     if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
         return FALSE;

-    
-    MacCreateRealWindow( title , pos , size , MacRemoveBordersFromStyle(style)  , name ) ;
-    
+
+    MacCreateRealWindow( title , pos , size , MacRemoveBordersFromStyle(style) & ~(wxYES|wxOK|wxNO|wxCANCEL) , name ) ;
+

     m_macWindowBackgroundTheme = kThemeBrushDialogBackgroundActive ;
     SetThemeWindowBackground( (WindowRef) m_macWindow , m_macWindowBackgroundTheme , false ) ;
 
     m_macWindowBackgroundTheme = kThemeBrushDialogBackgroundActive ;
     SetThemeWindowBackground( (WindowRef) m_macWindow , m_macWindowBackgroundTheme , false ) ;
 


@@ -76,7 +76,7 @@ void wxDialog::SetModal(bool flag)
     if ( flag )
     {
         m_windowStyle |= wxDIALOG_MODAL;
     if ( flag )
     {
         m_windowStyle |= wxDIALOG_MODAL;

-        
+

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


@@ -85,21 +85,21 @@ void wxDialog::SetModal(bool flag)
     else
     {
         m_windowStyle &= ~wxDIALOG_MODAL;
     else
     {
         m_windowStyle &= ~wxDIALOG_MODAL;

-        
+

         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 +108,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.


@@ -167,18 +167,6 @@ 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
     BeginAppModalStateForWindow(  (WindowRef) MacGetWindowRef()) ;
 #else
 #if TARGET_CARBON
     BeginAppModalStateForWindow(  (WindowRef) MacGetWindowRef()) ;
 #else


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

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

 }
 
 
 }