X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a756f210019dd5b51331b7181c816d3882146a30..3aa79a0117ad1f07511922e98ea35c38f336274b:/src/mac/carbon/dialog.cpp diff --git a/src/mac/carbon/dialog.cpp b/src/mac/carbon/dialog.cpp index eed25f3fb7..832ff9bc39 100644 --- a/src/mac/carbon/dialog.cpp +++ b/src/mac/carbon/dialog.cpp @@ -1,18 +1,20 @@ ///////////////////////////////////////////////////////////////////////////// // 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__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "dialog.h" #endif +#include "wx/wxprec.h" + #include "wx/dialog.h" #include "wx/utils.h" #include "wx/frame.h" @@ -30,7 +32,7 @@ extern wxList wxPendingDelete; #if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow) -BEGIN_EVENT_TABLE(wxDialog, wxTopLevelWindow) +BEGIN_EVENT_TABLE(wxDialog, wxDialogBase) EVT_BUTTON(wxID_OK, wxDialog::OnOK) EVT_BUTTON(wxID_APPLY, wxDialog::OnApply) EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel) @@ -44,10 +46,9 @@ 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, @@ -57,30 +58,31 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id, long style, const wxString& name) { + SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG); - SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)); - + // All dialogs should really have this style + style |= wxTAB_TRAVERSAL; - if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) ) + if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style & ~(wxYES|wxOK|wxNO|wxCANCEL) , name) ) return FALSE; - MacCreateRealWindow( title , pos , size , MacRemoveBordersFromStyle(style) , name ) ; - - m_macWindowBackgroundTheme = kThemeBrushDialogBackgroundActive ; - return TRUE; + return TRUE; } 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 ) ; +#endif } else { - m_windowStyle &= ~wxDIALOG_MODAL; + m_isModalStyle = false; wxModelessWindows.Append(this); } @@ -88,33 +90,32 @@ void wxDialog::SetModal(bool flag) 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 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); + 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(); + return; + } + // We didn't process this event. + event.Skip(); } bool wxDialog::IsModal() const { - return (GetWindowStyleFlag() & wxDIALOG_MODAL) != 0; + return m_isModalStyle; } @@ -123,8 +124,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) ) @@ -156,55 +155,50 @@ 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 ) + SetFocus() ; + +#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 - - bool formerModal = s_macIsInModalLoop ; - s_macIsInModalLoop = true ; - - while ( IsModalShowing() ) - { - while ( !wxTheApp->Pending() && wxTheApp->ProcessIdle() ) - { - } - wxTheApp->MacDoOneEvent() ; - } - - s_macIsInModalLoop = formerModal ; +#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 @@ -216,7 +210,7 @@ void wxDialog::EndModal(int retCode) } // Standard buttons -void wxDialog::OnOK(wxCommandEvent& event) +void wxDialog::OnOK(wxCommandEvent& WXUNUSED(event)) { if ( Validate() && TransferDataFromWindow() ) { @@ -224,19 +218,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. @@ -266,7 +260,7 @@ void wxDialog::OnCloseWindow(wxCloseEvent& event) closing.DeleteObject(this); } -void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& event) +void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event)) { SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)); Refresh();