X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/818e52c20151ce0c22aa752ccbab94f1ae7afc99..8290d43d0d43369d007f1c47abf98a45da461a30:/src/mac/dialog.cpp diff --git a/src/mac/dialog.cpp b/src/mac/dialog.cpp index e2bdb7c984..d75706f6a3 100644 --- a/src/mac/dialog.cpp +++ b/src/mac/dialog.cpp @@ -19,16 +19,18 @@ #include "wx/app.h" #include "wx/settings.h" +#include + // 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) @@ -37,10 +39,11 @@ BEGIN_EVENT_TABLE(wxDialog, wxPanel) EVT_CLOSE(wxDialog::OnCloseWindow) END_EVENT_TABLE() -#endif wxDialog::wxDialog() { + m_isShown = FALSE; + m_modalShowing = FALSE; SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE)); } @@ -52,7 +55,12 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id, const wxString& name) { m_windowStyle = style; + m_isShown = FALSE; + m_modalShowing = FALSE; +#if wxUSE_TOOLTIPS + m_hwndToolTip = 0; +#endif SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE)); SetName(name); @@ -66,9 +74,46 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id, else m_windowId = id; - // TODO: create dialog + 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 ; + } - return FALSE; + 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; } void wxDialog::SetModal(bool flag) @@ -86,11 +131,13 @@ void wxDialog::SetModal(bool flag) wxDialog::~wxDialog() { - // TODO + m_isBeingDeleted = TRUE ; wxTopLevelWindows.DeleteObject(this); - if ( (GetWindowStyleFlag() & wxDIALOG_MODAL) != wxDIALOG_MODAL ) - wxModelessWindows.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)) @@ -99,7 +146,7 @@ wxDialog::~wxDialog() if (wxTheApp->GetExitOnFrameDelete()) { - // TODO: exit + wxTheApp->ExitMainLoop() ; } } } @@ -123,40 +170,125 @@ void wxDialog::OnCharHook(wxKeyEvent& event) void wxDialog::Iconize(bool WXUNUSED(iconize)) { - // TODO + // mac dialogs cannot be iconized } bool wxDialog::IsIconized() const { - // TODO + // mac dialogs cannot be iconized return FALSE; } -void wxDialog::SetClientSize(int width, int height) +void wxDialog::DoSetClientSize(int width, int height) { - // TODO + wxWindow::DoSetClientSize( width , height ) ; } void wxDialog::GetPosition(int *x, int *y) const { - // TODO + DoGetPosition( x , y ) ; +} + +bool wxDialog::IsShown() const +{ + return m_isShown; +} + +bool wxDialog::IsModal() const +{ + return wxModalDialogs.Find((wxDialog *)this) != 0; // const_cast } + +extern bool s_macIsInModalLoop ; + bool wxDialog::Show(bool show) { - // TODO - return FALSE; + m_isShown = show; + + if (show) + InitDialog(); + + bool modal = ((GetWindowStyleFlag() & wxDIALOG_MODAL) == wxDIALOG_MODAL) ; + +#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 ; } void wxDialog::SetTitle(const wxString& title) { - // TODO + wxWindow::SetTitle( title ) ; } wxString wxDialog::GetTitle() const { - // TODO - return wxString(""); + return wxWindow::GetTitle() ; } void wxDialog::Centre(int direction) @@ -191,39 +323,37 @@ void wxDialog::Centre(int direction) // Replacement for Show(TRUE) for modal dialogs - returns return code int wxDialog::ShowModal() { - m_windowStyle |= wxDIALOG_MODAL; - // TODO: modal showing - Show(TRUE); - return GetReturnCode(); + m_windowStyle |= wxDIALOG_MODAL; + Show(TRUE); + return GetReturnCode(); } void wxDialog::EndModal(int retCode) { - SetReturnCode(retCode); - // TODO modal un-showing - Show(FALSE); + SetReturnCode(retCode); + Show(FALSE); } // Standard buttons void wxDialog::OnOK(wxCommandEvent& event) { - if ( Validate() && TransferDataFromWindow() ) - { + if ( Validate() && TransferDataFromWindow() ) + { if ( IsModal() ) EndModal(wxID_OK); else { - SetReturnCode(wxID_OK); - this->Show(FALSE); + SetReturnCode(wxID_OK); + this->Show(FALSE); } - } + } } void wxDialog::OnApply(wxCommandEvent& event) { - if (Validate()) - TransferDataFromWindow(); - // TODO probably need to disable the Apply button until things change again + if (Validate()) + TransferDataFromWindow(); + // TODO probably need to disable the Apply button until things change again } void wxDialog::OnCancel(wxCommandEvent& event) @@ -233,41 +363,45 @@ void wxDialog::OnCancel(wxCommandEvent& event) else { SetReturnCode(wxID_CANCEL); - this->Show(FALSE); + this->Show(FALSE); } } -bool wxDialog::OnClose() +void wxDialog::OnPaint(wxPaintEvent& event) +{ + // No: if you call the default procedure, it makes + // the following painting code not work. +// wxWindow::OnPaint(event); +} + +void wxDialog::OnCloseWindow(wxCloseEvent& event) { - // Behaviour changed in 2.0: we'll send a Cancel message by default, + // We'll send a Cancel message by default, // which may close the dialog. - // Check for looping if the Cancel event handler calls Close() + // 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 FALSE; + return; closing.Append(this); - wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL); - cancelEvent.SetEventObject( this ); - GetEventHandler()->ProcessEvent(cancelEvent); + wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL); + cancelEvent.SetEventObject( this ); + GetEventHandler()->ProcessEvent(cancelEvent); // This may close the dialog closing.DeleteObject(this); - - return FALSE; -} - -void wxDialog::OnCloseWindow(wxCloseEvent& event) -{ - // Compatibility - if ( GetEventHandler()->OnClose() || !event.CanVeto()) - { - this->Destroy(); - } - else - event.Veto(TRUE); } // Destroy the window (delayed, if a managed window) @@ -278,6 +412,17 @@ bool wxDialog::Destroy() 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)); @@ -286,4 +431,6 @@ void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& event) void wxDialog::Fit() { + wxWindow::Fit(); } +