X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e9576ca53db96b462ed4c0b4bdf47d64c40203e4..4813bb8d72d4e6821e031f2b19baaa338b714d39:/src/mac/carbon/dialog.cpp?ds=sidebyside diff --git a/src/mac/carbon/dialog.cpp b/src/mac/carbon/dialog.cpp index 7d6d99744d..966b6001ba 100644 --- a/src/mac/carbon/dialog.cpp +++ b/src/mac/carbon/dialog.cpp @@ -1,287 +1,184 @@ ///////////////////////////////////////////////////////////////////////////// -// 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" + +#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_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() +IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow) -#endif - -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); + SetExtraStyle( GetExtraStyle() | wxTOPLEVEL_EX_DIALOG ); - 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; + // ...but not these styles + style &= ~(wxYES | wxOK | wxNO); // | wxCANCEL - // TODO: create dialog - - return FALSE; -} + if ( !wxTopLevelWindow::Create( parent, id, title, pos, size, style, name ) ) + return false; -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); + return true; } -wxDialog::~wxDialog() +void wxDialog::SetModal( bool flag ) { - // TODO - wxTopLevelWindows.DeleteObject(this); + 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()) - { - // TODO: exit - } + 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; + 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; -bool wxDialog::IsIconized() const -{ - // TODO - return FALSE; + return wxDialogBase::IsEscapeKey(event); } -void wxDialog::SetClientSize(int width, int height) +bool wxDialog::IsModal() const { - // TODO + return wxModalDialogs.Find((wxDialog *)this) != NULL; // const_cast + // return m_isModalStyle; } -void wxDialog::GetPosition(int *x, int *y) const -{ - // TODO -} bool wxDialog::Show(bool show) { - // TODO - return FALSE; -} + if ( !wxDialogBase::Show(show) ) + // nothing to do + return false; -void wxDialog::SetTitle(const wxString& title) -{ - // TODO -} + if ( show ) + // usually will result in TransferDataToWindow() being called + InitDialog(); -wxString wxDialog::GetTitle() const -{ - // TODO - return wxString(""); -} + HiliteMenu(0); -void wxDialog::Centre(int direction) -{ - int x_offset,y_offset ; - int display_width, display_height; - int width, height, x, y; - wxWindow *parent = GetParent(); - if ((direction & wxCENTER_FRAME) && parent) - { - parent->GetPosition(&x_offset,&y_offset) ; - parent->GetSize(&display_width,&display_height) ; - } - else - { - wxDisplaySize(&display_width, &display_height); - x_offset = 0 ; - y_offset = 0 ; - } - - GetSize(&width, &height); - GetPosition(&x, &y); - - if (direction & wxHORIZONTAL) - x = (int)((display_width - width)/2); - if (direction & wxVERTICAL) - y = (int)((display_height - height)/2); - - SetSize(x+x_offset, y+y_offset, width, height); -} - -// Replacement for Show(TRUE) for modal dialogs - returns return code -int wxDialog::ShowModal() -{ - m_windowStyle |= wxDIALOG_MODAL; - // TODO: modal showing - Show(TRUE); - return GetReturnCode(); -} - -void wxDialog::EndModal(int retCode) -{ - SetReturnCode(retCode); - // TODO modal un-showing - Show(FALSE); -} - -// Standard buttons -void wxDialog::OnOK(wxCommandEvent& event) -{ - if ( Validate() && TransferDataFromWindow() ) - { - if ( IsModal() ) - EndModal(wxID_OK); - else + if ( m_isModalStyle ) + { + if ( show ) { - SetReturnCode(wxID_OK); - this->Show(FALSE); + DoShowModal(); + } + else // end of modal dialog + { + // this will cause IsModalShowing() return false and our local + // message loop will terminate + wxModalDialogs.DeleteObject(this); } - } -} - -void wxDialog::OnApply(wxCommandEvent& event) -{ - if (Validate()) - TransferDataFromWindow(); - // TODO probably need to disable the Apply button until things change again -} - -void wxDialog::OnCancel(wxCommandEvent& event) -{ - if ( IsModal() ) - EndModal(wxID_CANCEL); - else - { - SetReturnCode(wxID_CANCEL); - this->Show(FALSE); } + + return true; } -bool wxDialog::OnClose() +void wxDialog::DoShowModal() { - // Behaviour changed in 2.0: we'll send a Cancel message by default, - // which may close the dialog. - // Check for looping if the Cancel event handler calls Close() - - static wxList closing; + wxCHECK_RET( !IsModal(), wxT("DoShowModal() called twice") ); - if ( closing.Member(this) ) - return FALSE; + wxModalDialogs.Append(this); - closing.Append(this); + SetFocus() ; - wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL); - cancelEvent.SetEventObject( this ); - GetEventHandler()->ProcessEvent(cancelEvent); + WindowRef windowRef = (WindowRef) MacGetWindowRef(); + WindowGroupRef windowGroup; + WindowGroupRef formerParentGroup; + bool resetGroupParent = false; - closing.DeleteObject(this); + if ( GetParent() == NULL ) + { + windowGroup = GetWindowGroup(windowRef) ; + formerParentGroup = GetWindowGroupParent( windowGroup ); + SetWindowGroupParent( windowGroup, GetWindowGroupOfClass( kMovableModalWindowClass ) ); + resetGroupParent = true; + } + BeginAppModalStateForWindow(windowRef) ; - return FALSE; -} + while ( IsModal() ) + { + wxTheApp->MacDoOneEvent() ; + // calls process idle itself + } -void wxDialog::OnCloseWindow(wxCloseEvent& event) -{ - // Compatibility - if ( GetEventHandler()->OnClose() || event.GetForce()) + EndAppModalStateForWindow(windowRef) ; + if ( resetGroupParent ) { - this->Destroy(); + SetWindowGroupParent( windowGroup , formerParentGroup ); } } -// Destroy the window (delayed, if a managed window) -bool wxDialog::Destroy() -{ - if (!wxPendingDelete.Member(this)) - wxPendingDelete.Append(this); - return TRUE; -} -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) { + SetReturnCode(retCode); + Show(false); + SetModal(false); } +