X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e75491071dbefcada61175e3eb89ce4edf335983..0c1cc9483ecba053bc9a0983a4a8d48898e334f2:/src/mac/carbon/dialog.cpp diff --git a/src/mac/carbon/dialog.cpp b/src/mac/carbon/dialog.cpp index 2acc18174e..bb90e3812b 100644 --- a/src/mac/carbon/dialog.cpp +++ b/src/mac/carbon/dialog.cpp @@ -1,365 +1,189 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dialog.cpp +// Name: src/mac/carbon/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__ -#pragma implementation "dialog.h" -#endif +#include "wx/wxprec.h" #include "wx/dialog.h" -#include "wx/utils.h" -#include "wx/frame.h" -#include "wx/app.h" -#include "wx/settings.h" -#include +#ifndef WX_PRECOMP + #include "wx/app.h" + #include "wx/utils.h" + #include "wx/frame.h" + #include "wx/settings.h" +#endif // WX_PRECOMP + +#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 -extern wxList wxPendingDelete; - -#if !USE_SHARED_LIBRARY -IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxPanel) - -BEGIN_EVENT_TABLE(wxDialog, wxPanel) - EVT_SIZE(wxDialog::OnSize) - 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() -#endif +IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow) -wxDialog::wxDialog() +void wxDialog::Init() { - SetBackgroundColour(wxSystemSettings::GetSystemColour(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 ) { - m_windowStyle = style; - - SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE)); - SetName(name); - - if (!parent) - wxTopLevelWindows.Append(this); - - if (parent) parent->AddChild(this); - - if ( id == -1 ) - m_windowId = (int)NewControlId(); - else - m_windowId = id; - - Rect theBoundsRect; - - m_x = (int)pos.x; - m_y = (int)pos.y; - if ( m_y < 50 ) - m_y = 50 ; - if ( m_x < 20 ) - m_x = 20 ; - - m_width = size.x; - if (m_width == -1) - m_width = 20; - m_height = size.y; - if (m_height == -1) - m_height = 20; - - ::SetRect(&theBoundsRect, m_x, m_y, m_x + m_width, m_y + m_height); - m_macWindowData = new MacWindowData() ; - - WindowClass wclass = kMovableModalWindowClass ; - WindowAttributes attr = kWindowNoAttributes ; - - if ( ( m_windowStyle & wxMINIMIZE_BOX ) || ( m_windowStyle & wxMAXIMIZE_BOX ) ) - { - attr |= kWindowFullZoomAttribute ; - attr |= kWindowResizableAttribute ; - } - - UMACreateNewWindow( wclass , attr , &theBoundsRect , &m_macWindowData->m_macWindow ) ; - wxAssociateWinWithMacWindow( m_macWindowData->m_macWindow , this ) ; - wxString label ; - if( wxApp::s_macDefaultEncodingIsPC ) - label = wxMacMakeMacStringFromPC( title ) ; - else - label = title ; - UMASetWTitleC( m_macWindowData->m_macWindow , label ) ; - m_macWindowData->m_macWindowBackgroundTheme = kThemeBrushDialogBackgroundActive ; - UMACreateRootControl( m_macWindowData->m_macWindow , &m_macWindowData->m_macRootControl ) ; - m_macWindowData->m_macFocus = NULL ; - return TRUE; -} + SetExtraStyle( GetExtraStyle() | wxTOPLEVEL_EX_DIALOG ); -void wxDialog::SetModal(bool flag) -{ - if ( flag ) - m_windowStyle |= wxDIALOG_MODAL ; - else - if ( m_windowStyle & wxDIALOG_MODAL ) - m_windowStyle -= wxDIALOG_MODAL ; - - wxModelessWindows.DeleteObject(this); - if (!flag) - wxModelessWindows.Append(this); + // 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; + + return true; } -wxDialog::~wxDialog() +void wxDialog::SetModal( bool flag ) { - m_isBeingDeleted = TRUE ; - wxTopLevelWindows.DeleteObject(this); - - m_modalShowing = FALSE; + if ( flag ) + { + m_isModalStyle = true; - if ( (GetWindowStyleFlag() & wxDIALOG_MODAL) != wxDIALOG_MODAL ) - wxModelessWindows.DeleteObject(this); + wxModelessWindows.DeleteObject( this ); - // If this is the last top-level window, exit. - if (wxTheApp && (wxTopLevelWindows.Number() == 0)) + SetWindowModality( (WindowRef)MacGetWindowRef(), kWindowModalityAppModal, NULL ) ; + } + else { - wxTheApp->SetTopWindow(NULL); + m_isModalStyle = false; - if (wxTheApp->GetExitOnFrameDelete()) - { - wxTheApp->ExitMainLoop() ; - } + wxModelessWindows.Append( this ); } } -// By default, pressing escape cancels the dialog -void wxDialog::OnCharHook(wxKeyEvent& event) +wxDialog::~wxDialog() { - 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(); + m_isBeingDeleted = true; + + // if the dialog is modal, this will end its event loop + Show(false); } -void wxDialog::Iconize(bool WXUNUSED(iconize)) +// On mac command-stop does the same thing as Esc, let the base class know +// about it +bool wxDialog::IsEscapeKey(const wxKeyEvent& event) { - // TODO + if ( event.GetKeyCode() == '.' && event.GetModifiers() == wxMOD_CMD ) + return true; + + return wxDialogBase::IsEscapeKey(event); } -bool wxDialog::IsIconized() const +bool wxDialog::IsModal() const { - // TODO - return FALSE; + return wxModalDialogs.Find((wxDialog *)this) != NULL; // const_cast + // return m_isModalStyle; } -extern bool s_macIsInModalLoop ; bool wxDialog::Show(bool show) { - m_isShown = show; + if ( !wxDialogBase::Show(show) ) + // nothing to do + return false; - if (show) - InitDialog(); + if (show && CanDoLayoutAdaptation()) + DoLayoutAdaptation(); - bool modal = ((GetWindowStyleFlag() & wxDIALOG_MODAL) == wxDIALOG_MODAL) ; + if ( show ) + // usually will result in TransferDataToWindow() being called + InitDialog(); -#if WXGARBAGE_COLLECTION_ON /* MATTHEW: GC */ - if (!modal) - { - if (show) - { - if (!wxModelessWindows.Find(this)) - wxModelessWindows.Append(this); - } - else - wxModelessWindows.DeleteObject(this); - } - if (show) - { - if (!wxTopLevelWindows.Find(this)) - wxTopLevelWindows.Append(this); - } - else - wxTopLevelWindows.DeleteObject(this); -#endif - - if ( modal ) - { - s_macIsInModalLoop = true ; - if (show) - { - if (m_modalShowing) - { -// BringWindowToTop((HWND) GetHWND()); - return TRUE; - } - - m_modalShowing = TRUE; - // if we don't do it, some window might be deleted while we have pointers - // to them in our disabledWindows list and the program will crash when it - // will try to reenable them after the modal dialog end - wxTheApp->DeletePendingObjects(); - - UMAShowWindow( m_macWindowData->m_macWindow ) ; - UMASelectWindow( m_macWindowData->m_macWindow ) ; - - if (!wxModalDialogs.Member(this)) - wxModalDialogs.Append(this); - - while (wxModalDialogs.Member(this) ) - { - wxTheApp->MacDoOneEvent() ; - } - } - else - { - wxModalDialogs.DeleteObject(this); - UMAHideWindow( m_macWindowData->m_macWindow ) ; - } - s_macIsInModalLoop = false ; - } - else // !modal - { - if (show) - { - UMAShowWindow( m_macWindowData->m_macWindow ) ; - UMASelectWindow( m_macWindowData->m_macWindow ) ; - } - else - { - UMAHideWindow( m_macWindowData->m_macWindow ) ; - } - } - return TRUE ; -} + HiliteMenu(0); + if ( m_isModalStyle ) + { + if ( show ) + { + DoShowModal(); + } + else // end of modal dialog + { + // this will cause IsModalShowing() return false and our local + // message loop will terminate + wxModalDialogs.DeleteObject(this); + } + } -// Replacement for Show(TRUE) for modal dialogs - returns return code -int wxDialog::ShowModal() -{ - m_windowStyle |= wxDIALOG_MODAL; - Show(TRUE); - return GetReturnCode(); + return true; } -void wxDialog::EndModal(int retCode) +void wxDialog::DoShowModal() { - SetReturnCode(retCode); - // TODO modal un-showing - Show(FALSE); -} + wxCHECK_RET( !IsModal(), wxT("DoShowModal() called twice") ); -// Standard buttons -void wxDialog::OnOK(wxCommandEvent& event) -{ - if ( Validate() && TransferDataFromWindow() ) - { - if ( IsModal() ) - EndModal(wxID_OK); - else - { - SetReturnCode(wxID_OK); - this->Show(FALSE); - } - } -} + wxModalDialogs.Append(this); -void wxDialog::OnApply(wxCommandEvent& event) -{ - if (Validate()) - TransferDataFromWindow(); - // TODO probably need to disable the Apply button until things change again -} + SetFocus() ; -void wxDialog::OnCancel(wxCommandEvent& event) -{ - if ( IsModal() ) - EndModal(wxID_CANCEL); - else + WindowRef windowRef = (WindowRef) MacGetWindowRef(); + WindowGroupRef windowGroup; + WindowGroupRef formerParentGroup; + bool resetGroupParent = false; + + if ( GetParent() == NULL ) { - SetReturnCode(wxID_CANCEL); - this->Show(FALSE); + windowGroup = GetWindowGroup(windowRef) ; + formerParentGroup = GetWindowGroupParent( windowGroup ); + SetWindowGroupParent( windowGroup, GetWindowGroupOfClass( kMovableModalWindowClass ) ); + resetGroupParent = true; } -} + BeginAppModalStateForWindow(windowRef) ; -void wxDialog::OnCloseWindow(wxCloseEvent& event) -{ - // We'll send a Cancel message by default, - // which may close the dialog. - // Check for looping if the Cancel event handler calls Close(). - - // Note that if a cancel button and handler aren't present in the dialog, - // nothing will happen when you close the dialog via the window manager, or - // via Close(). - // We wouldn't want to destroy the dialog by default, since the dialog may have been - // created on the stack. - // However, this does mean that calling dialog->Close() won't delete the dialog - // unless the handler for wxID_CANCEL does so. So use Destroy() if you want to be - // sure to destroy the dialog. - // The default OnCancel (above) simply ends a modal dialog, and hides a modeless dialog. - - static wxList closing; - - if ( closing.Member(this) ) - return; - - closing.Append(this); - - wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL); - cancelEvent.SetEventObject( this ); - GetEventHandler()->ProcessEvent(cancelEvent); // This may close the dialog - - closing.DeleteObject(this); -} - -// Destroy the window (delayed, if a managed window) -bool wxDialog::Destroy() -{ - if (!wxPendingDelete.Member(this)) - wxPendingDelete.Append(this); - return TRUE; -} + while ( IsModal() ) + { + wxTheApp->MacDoOneEvent() ; + // calls process idle itself + } -void wxDialog::OnSize(wxSizeEvent& WXUNUSED(event)) -{ - // if we're using constraints - do use them - #if wxUSE_CONSTRAINTS - if ( GetAutoLayout() ) { - Layout(); + EndAppModalStateForWindow(windowRef) ; + if ( resetGroupParent ) + { + SetWindowGroupParent( windowGroup , formerParentGroup ); } - #endif } -void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& event) + +// Replacement for Show(true) for modal dialogs - returns return code +int wxDialog::ShowModal() { - SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE)); - Refresh(); + if ( !m_isModalStyle ) + SetModal(true); + + Show(true); + + return GetReturnCode(); } -void wxDialog::Fit() +// 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) { - wxWindow::Fit(); + SetReturnCode(retCode); + Show(false); + SetModal(false); }