X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2f1ae4143271ae63a17e052a1a471d16e9cd8c44..4b5386874a1602f5c8b6edbfa74e4d6be619768f:/src/mac/carbon/dialog.cpp?ds=inline diff --git a/src/mac/carbon/dialog.cpp b/src/mac/carbon/dialog.cpp index 760c07680a..16f3a0fb7f 100644 --- a/src/mac/carbon/dialog.cpp +++ b/src/mac/carbon/dialog.cpp @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// // Name: dialog.cpp // Purpose: wxDialog class -// Author: AUTHOR +// Author: Stefan Csomor // Modified by: -// Created: ??/??/98 +// Created: 1998-01-01 // RCS-ID: $Id$ -// Copyright: (c) AUTHOR -// Licence: wxWindows licence +// Copyright: (c) Stefan Csomor +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -19,24 +19,26 @@ #include "wx/app.h" #include "wx/settings.h" -#include +#include "wx/mac/uma.h" // Lists to keep track of windows, so we can disable/enable them // for modal dialogs wxList wxModalDialogs; -wxList wxModelessWindows; // Frames and modeless dialogs +//wxList wxModelessWindows; // Frames and modeless dialogs extern wxList wxPendingDelete; #if !USE_SHARED_LIBRARY -IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxPanel) +IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow) -BEGIN_EVENT_TABLE(wxDialog, wxPanel) - EVT_SIZE(wxDialog::OnSize) +BEGIN_EVENT_TABLE(wxDialog, wxDialogBase) EVT_BUTTON(wxID_OK, wxDialog::OnOK) EVT_BUTTON(wxID_APPLY, wxDialog::OnApply) EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel) + EVT_CHAR_HOOK(wxDialog::OnCharHook) + EVT_SYS_COLOUR_CHANGED(wxDialog::OnSysColourChanged) + EVT_CLOSE(wxDialog::OnCloseWindow) END_EVENT_TABLE() @@ -44,8 +46,8 @@ END_EVENT_TABLE() wxDialog::wxDialog() { - m_isShown = FALSE; - SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE)); + m_isShown = FALSE; + SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)); } bool wxDialog::Create(wxWindow *parent, wxWindowID id, @@ -55,32 +57,29 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id, long style, const wxString& name) { + SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG); - SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE)); - - if (!parent) - wxTopLevelWindows.Append(this); - - if (parent) parent->AddChild(this); + // All dialogs should really have this style + style |= wxTAB_TRAVERSAL; - if ( id == -1 ) - m_windowId = (int)NewControlId(); - else - m_windowId = id; + if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) ) + return FALSE; - MacCreateRealWindow( title , pos , size , MacRemoveBordersFromStyle(style) , name ) ; + SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)); - m_macWindowData->m_macWindowBackgroundTheme = kThemeBrushDialogBackgroundActive ; - return TRUE; + return TRUE; } void wxDialog::SetModal(bool flag) { - if ( flag ) + if ( flag ) { m_windowStyle |= wxDIALOG_MODAL; wxModelessWindows.DeleteObject(this); +#if TARGET_CARBON + SetWindowModality( (WindowRef) MacGetWindowRef() , kWindowModalityAppModal , NULL ) ; +#endif } else { @@ -92,62 +91,27 @@ void wxDialog::SetModal(bool flag) wxDialog::~wxDialog() { - m_isBeingDeleted = TRUE ; - wxTopLevelWindows.DeleteObject(this); - - Show(FALSE); - - if ( !IsModal() ) - wxModelessWindows.DeleteObject(this); - - // If this is the last top-level window, exit. - if (wxTheApp && (wxTopLevelWindows.Number() == 0)) - { - wxTheApp->SetTopWindow(NULL); - - if (wxTheApp->GetExitOnFrameDelete()) - { - wxTheApp->ExitMainLoop() ; - } - } + m_isBeingDeleted = TRUE; + Show(FALSE); } -// By default, pressing escape cancels the dialog +// 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) - { - // 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(); -} - -void wxDialog::Iconize(bool WXUNUSED(iconize)) -{ - // mac dialogs cannot be iconized -} - -bool wxDialog::IsIconized() const -{ - // mac dialogs cannot be iconized - return FALSE; -} - -void wxDialog::DoSetClientSize(int width, int height) -{ - wxWindow::DoSetClientSize( width , height ) ; -} + 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); -void wxDialog::DoGetPosition(int *x, int *y) const -{ - wxWindow::DoGetPosition( x , y ) ; + return; + } + // We didn't process this event. + event.Skip(); } bool wxDialog::IsModal() const @@ -161,9 +125,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) ) @@ -195,54 +156,48 @@ 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") ); wxModalDialogs.Append(this); - wxWindow *parent = GetParent(); - - // remember where the focus was - wxWindow *winFocus = FindFocus(); - if ( !winFocus ) - { - winFocus = parent; - } - if ( !winFocus ) +#if TARGET_CARBON + BeginAppModalStateForWindow( (WindowRef) MacGetWindowRef()) ; +#else + // TODO : test whether parent gets disabled + bool formerModal = s_macIsInModalLoop ; + s_macIsInModalLoop = true ; +#endif + while ( IsModalShowing() ) { - winFocus = wxTheApp->GetTopWindow(); + wxTheApp->MacDoOneEvent() ; + // calls process idle itself } - // TODO : test whether parent gets disabled - - s_macIsInModalLoop = true ; - - while ( IsModalShowing() ) - { - while ( !wxTheApp->Pending() && wxTheApp->ProcessIdle() ) - { - } - wxTheApp->MacDoOneEvent() ; - } - - s_macIsInModalLoop = false ; +#if TARGET_CARBON + EndAppModalStateForWindow( (WindowRef) MacGetWindowRef() ) ; +#else // TODO probably reenable the parent window if any - - // and restore focus - if ( winFocus ) - { - winFocus->SetFocus(); - } + s_macIsInModalLoop = formerModal ; +#endif } // 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 @@ -254,7 +209,7 @@ void wxDialog::EndModal(int retCode) } // Standard buttons -void wxDialog::OnOK(wxCommandEvent& event) +void wxDialog::OnOK(wxCommandEvent& WXUNUSED(event)) { if ( Validate() && TransferDataFromWindow() ) { @@ -262,19 +217,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. @@ -304,19 +259,9 @@ void wxDialog::OnCloseWindow(wxCloseEvent& event) closing.DeleteObject(this); } -// Destroy the window (delayed, if a managed window) -bool wxDialog::Destroy() -{ - wxCHECK_MSG( !wxPendingDelete.Member(this), FALSE, - _T("wxDialog destroyed twice") ); - - wxPendingDelete.Append(this); - return TRUE; -} - -void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& event) +void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event)) { - SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE)); + SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)); Refresh(); }