X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad81651f00edc6f489d9b6a0839d316a964fd521..7368be43c35fbdfc5cecb190a5d299f173866b37:/src/mac/carbon/dialog.cpp diff --git a/src/mac/carbon/dialog.cpp b/src/mac/carbon/dialog.cpp index d75706f6a3..af14cbc258 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,32 +19,34 @@ #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; -IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxPanel) +#if !USE_SHARED_LIBRARY +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() +#endif -wxDialog::wxDialog() +void wxDialog::Init() { - m_isShown = FALSE; - m_modalShowing = FALSE; - SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE)); + m_isModalStyle = false; } bool wxDialog::Create(wxWindow *parent, wxWindowID id, @@ -54,280 +56,149 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id, long style, const wxString& name) { - m_windowStyle = style; - m_isShown = FALSE; - m_modalShowing = FALSE; + SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG); -#if wxUSE_TOOLTIPS - m_hwndToolTip = 0; -#endif - 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; -} + // All dialogs should really have this style + style |= wxTAB_TRAVERSAL; -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); + if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style & ~(wxYES|wxOK|wxNO|wxCANCEL) , name) ) + return FALSE; + + return TRUE; } -wxDialog::~wxDialog() +void wxDialog::SetModal(bool flag) { - m_isBeingDeleted = TRUE ; - wxTopLevelWindows.DeleteObject(this); - - m_modalShowing = FALSE; - - if ( (GetWindowStyleFlag() & wxDIALOG_MODAL) != wxDIALOG_MODAL ) - wxModelessWindows.DeleteObject(this); - - // If this is the last top-level window, exit. - if (wxTheApp && (wxTopLevelWindows.Number() == 0)) + if ( flag ) { - wxTheApp->SetTopWindow(NULL); + m_isModalStyle = true; - if (wxTheApp->GetExitOnFrameDelete()) - { - wxTheApp->ExitMainLoop() ; - } + wxModelessWindows.DeleteObject(this); +#if TARGET_CARBON + SetWindowModality( (WindowRef) MacGetWindowRef() , kWindowModalityAppModal , NULL ) ; +#endif } -} - -// By default, pressing escape cancels the dialog -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); + else + { + m_isModalStyle = false; - return; - } - // We didn't process this event. - event.Skip(); + wxModelessWindows.Append(this); + } } -void wxDialog::Iconize(bool WXUNUSED(iconize)) +wxDialog::~wxDialog() { - // mac dialogs cannot be iconized + m_isBeingDeleted = TRUE; + Show(FALSE); } -bool wxDialog::IsIconized() const +// By default, pressing escape cancels the dialog , on mac command-stop does the same thing +void wxDialog::OnCharHook(wxKeyEvent& event) { - // mac dialogs cannot be iconized - return FALSE; -} + 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::DoSetClientSize(int width, int height) -{ - wxWindow::DoSetClientSize( width , height ) ; + return; + } + // We didn't process this event. + event.Skip(); } -void wxDialog::GetPosition(int *x, int *y) const +bool wxDialog::IsModal() const { - DoGetPosition( x , y ) ; + return m_isModalStyle; } -bool wxDialog::IsShown() const -{ - return m_isShown; -} -bool wxDialog::IsModal() const +bool wxDialog::IsModalShowing() const { - return wxModalDialogs.Find((wxDialog *)this) != 0; // const_cast + return wxModalDialogs.Find((wxDialog *)this) != NULL; // const_cast } - -extern bool s_macIsInModalLoop ; - bool wxDialog::Show(bool show) { - m_isShown = show; - - if (show) - InitDialog(); - - bool modal = ((GetWindowStyleFlag() & wxDIALOG_MODAL) == wxDIALOG_MODAL) ; + if ( !wxDialogBase::Show(show) ) + { + // nothing to do + return FALSE; + } -#if WXGARBAGE_COLLECTION_ON /* MATTHEW: GC */ - if (!modal) - { - if (show) + 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 + // usually will result in TransferDataToWindow() being called + InitDialog(); + } - 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 ; -} + if ( IsModal() ) + { + if ( show ) + { + DoShowModal(); + } + else // end of modal dialog + { + // this will cause IsModalShowing() return FALSE and our local + // message loop will terminate + wxModalDialogs.DeleteObject(this); + } + } -void wxDialog::SetTitle(const wxString& title) -{ - wxWindow::SetTitle( title ) ; + return TRUE; } -wxString wxDialog::GetTitle() const -{ - return wxWindow::GetTitle() ; -} +#if !TARGET_CARBON +extern bool s_macIsInModalLoop ; +#endif -void wxDialog::Centre(int direction) +void wxDialog::DoShowModal() { - 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 ; - } + wxCHECK_RET( !IsModalShowing(), _T("DoShowModal() called twice") ); - GetSize(&width, &height); - GetPosition(&x, &y); + wxModalDialogs.Append(this); - if (direction & wxHORIZONTAL) - x = (int)((display_width - width)/2); - if (direction & wxVERTICAL) - y = (int)((display_height - height)/2); +#if TARGET_CARBON +// BeginAppModalStateForWindow( (WindowRef) MacGetWindowRef()) ; +#else + // TODO : test whether parent gets disabled + bool formerModal = s_macIsInModalLoop ; + s_macIsInModalLoop = true ; +#endif + while ( IsModalShowing() ) + { + wxTheApp->MacDoOneEvent() ; + // calls process idle itself + } - SetSize(x+x_offset, y+y_offset, width, height); +#if TARGET_CARBON +// EndAppModalStateForWindow( (WindowRef) MacGetWindowRef() ) ; +#else + // TODO probably reenable the parent window if any + 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 +// dialogs and should work for both of them void wxDialog::EndModal(int retCode) { SetReturnCode(retCode); @@ -335,46 +206,27 @@ void wxDialog::EndModal(int retCode) } // Standard buttons -void wxDialog::OnOK(wxCommandEvent& event) +void wxDialog::OnOK(wxCommandEvent& WXUNUSED(event)) { if ( Validate() && TransferDataFromWindow() ) { - if ( IsModal() ) - EndModal(wxID_OK); - else - { - SetReturnCode(wxID_OK); - this->Show(FALSE); - } + EndModal(wxID_OK); } } -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) -{ - if ( IsModal() ) - EndModal(wxID_CANCEL); - else - { - SetReturnCode(wxID_CANCEL); - this->Show(FALSE); - } -} - -void wxDialog::OnPaint(wxPaintEvent& event) +void wxDialog::OnCancel(wxCommandEvent& WXUNUSED(event)) { - // No: if you call the default procedure, it makes - // the following painting code not work. -// wxWindow::OnPaint(event); + 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. @@ -404,33 +256,9 @@ void wxDialog::OnCloseWindow(wxCloseEvent& event) closing.DeleteObject(this); } -// Destroy the window (delayed, if a managed window) -bool wxDialog::Destroy() +void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event)) { - if (!wxPendingDelete.Member(this)) - wxPendingDelete.Append(this); - return TRUE; -} - -void wxDialog::OnSize(wxSizeEvent& WXUNUSED(event)) -{ - // if we're using constraints - do use them - #if wxUSE_CONSTRAINTS - if ( GetAutoLayout() ) - { - Layout(); - } - #endif -} - -void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& event) -{ - SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE)); + SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)); Refresh(); } -void wxDialog::Fit() -{ - wxWindow::Fit(); -} -