X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/798a4529fe37bfd1864b4ed350e7de603bd40f2b..bba35861478a26f5d8c756a9a7fa2bbd19a69cb1:/src/motif/dialog.cpp diff --git a/src/motif/dialog.cpp b/src/motif/dialog.cpp index bb4a45ea2f..3955a68d45 100644 --- a/src/motif/dialog.cpp +++ b/src/motif/dialog.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dialog.cpp +// Name: src/motif/dialog.cpp // Purpose: wxDialog class // Author: Julian Smart // Modified by: @@ -9,21 +9,18 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "dialog.h" -#endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#include "wx/dialog.h" -#ifdef __VMS -#define XtDisplay XTDISPLAY -#define XtWindow XTWINDOW -#define XtParent XTPARENT -#define XtScreen XTSCREEN +#ifndef WX_PRECOMP + #include "wx/app.h" + #include "wx/utils.h" + #include "wx/settings.h" #endif -#include "wx/dialog.h" -#include "wx/utils.h" -#include "wx/app.h" -#include "wx/settings.h" +#include "wx/evtloop.h" #ifdef __VMS__ #pragma message disable nosimpint @@ -56,32 +53,21 @@ // A stack of modal_showing flags, since we can't rely // on accessing wxDialog::m_modalShowing within // wxDialog::Show in case a callback has deleted the wxDialog. -static wxList wxModalShowingStack; +// static wxList wxModalShowingStack; // Lists to keep track of windows, so we can disable/enable them // for modal dialogs wxList wxModalDialogs; extern wxList wxModelessWindows; // Frames and modeless dialogs -extern wxList wxPendingDelete; #define wxUSE_INVISIBLE_RESIZE 1 IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow) -BEGIN_EVENT_TABLE(wxDialog, wxTopLevelWindow) - 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() - - wxDialog::wxDialog() { - m_modalShowing = FALSE; - m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); + m_modalShowing = false; + m_eventLoop = NULL; } bool wxDialog::Create(wxWindow *parent, wxWindowID id, @@ -95,62 +81,58 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id, if( !wxTopLevelWindow::Create( parent, id, title, pos, size, style, name ) ) - return FALSE; - - m_modalShowing = FALSE; + return false; - m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); - m_foregroundColour = *wxBLACK; + m_modalShowing = false; + m_eventLoop = NULL; Widget dialogShell = (Widget) m_mainWidget; - Widget shell = XtParent(dialogShell) ; SetTitle( title ); - m_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); - ChangeFont(FALSE); - // Can't remember what this was about... but I think it's necessary. - if (wxUSE_INVISIBLE_RESIZE) - { - if (pos.x > -1) - XtVaSetValues(dialogShell, XmNx, pos.x, - NULL); - if (pos.y > -1) - XtVaSetValues(dialogShell, XmNy, pos.y, - NULL); - - if (size.x > -1) - XtVaSetValues(dialogShell, XmNwidth, size.x, NULL); - if (size.y > -1) - XtVaSetValues(dialogShell, XmNheight, size.y, NULL); - } +#if wxUSE_INVISIBLE_RESIZE + if (pos.x > -1) + XtVaSetValues(dialogShell, XmNx, pos.x, + NULL); + if (pos.y > -1) + XtVaSetValues(dialogShell, XmNy, pos.y, + NULL); + + if (size.x > -1) + XtVaSetValues(dialogShell, XmNwidth, size.x, NULL); + if (size.y > -1) + XtVaSetValues(dialogShell, XmNheight, size.y, NULL); +#endif // Positioning of the dialog doesn't work properly unless the dialog // is managed, so we manage without mapping to the screen. // To show, we map the shell (actually it's parent). - if (!wxUSE_INVISIBLE_RESIZE) - XtVaSetValues(shell, XmNmappedWhenManaged, FALSE, NULL); +#if !wxUSE_INVISIBLE_RESIZE + Widget shell = XtParent(dialogShell) ; + XtVaSetValues(shell, XmNmappedWhenManaged, False, NULL); +#endif - if (!wxUSE_INVISIBLE_RESIZE) - { - XtManageChild(dialogShell); - SetSize(pos.x, pos.y, size.x, size.y); - } - XtAddEventHandler(dialogShell,ExposureMask,FALSE, +#if !wxUSE_INVISIBLE_RESIZE + XtManageChild(dialogShell); + SetSize(pos.x, pos.y, size.x, size.y); +#endif + + XtAddEventHandler(dialogShell,ExposureMask,False, wxUniversalRepaintProc, (XtPointer) this); - ChangeBackgroundColour(); + PostCreation(); - return TRUE; + return true; } -bool wxDialog::DoCreate( wxWindow* parent, wxWindowID id, - const wxString& title, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name ) +bool wxDialog::XmDoCreateTLW(wxWindow* parent, + wxWindowID WXUNUSED(id), + const wxString& WXUNUSED(title), + const wxPoint& WXUNUSED(pos), + const wxSize& WXUNUSED(size), + long WXUNUSED(style), + const wxString& name) { Widget parentWidget = (Widget) 0; if( parent ) @@ -165,7 +147,8 @@ bool wxDialog::DoCreate( wxWindow* parent, wxWindowID id, XtSetArg (args[0], XmNdefaultPosition, False); XtSetArg (args[1], XmNautoUnmanage, False); Widget dialogShell = - XmCreateBulletinBoardDialog( parentWidget, (char*)name.c_str(), + XmCreateBulletinBoardDialog( parentWidget, + name.char_str(), args, 2); m_mainWidget = (WXWidget) dialogShell; @@ -185,65 +168,50 @@ bool wxDialog::DoCreate( wxWindow* parent, wxWindowID id, wxAddWindowToTable( (Widget)m_mainWidget, this ); - return TRUE; + return true; } 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 ( flag ) + wxModelessWindows.DeleteObject(this); + else + wxModelessWindows.Append(this); } wxDialog::~wxDialog() { - m_isBeingDeleted = TRUE; + m_isBeingDeleted = true; + + // if the dialog is modal, this will end its event loop + Show(false); + + delete m_eventLoop; if (m_mainWidget) { - XtRemoveEventHandler((Widget) m_mainWidget, ExposureMask, FALSE, + XtRemoveEventHandler((Widget) m_mainWidget, ExposureMask, False, wxUniversalRepaintProc, (XtPointer) this); } - m_modalShowing = FALSE; - if (!wxUSE_INVISIBLE_RESIZE && m_mainWidget) + m_modalShowing = false; + +#if !wxUSE_INVISIBLE_RESIZE + if (m_mainWidget) { XtUnmapWidget((Widget) m_mainWidget); } -} +#endif -void wxDialog::DoDestroy() -{ - if( m_mainWidget ) + PreDestroy(); + + if ( m_mainWidget ) { wxDeleteWindowFromTable( (Widget)m_mainWidget ); XtDestroyWidget( (Widget)m_mainWidget ); } } -// 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); - - return; - } - // We didn't process this event. - event.Skip(); -} - void wxDialog::DoSetSize(int x, int y, int width, int height, int sizeFlags) { XtVaSetValues((Widget) m_mainWidget, XmNresizePolicy, XmRESIZE_ANY, NULL); @@ -264,100 +232,83 @@ void wxDialog::SetTitle(const wxString& title) { wxXmString str( title ); XtVaSetValues( (Widget)m_mainWidget, - XmNtitle, title.c_str(), - XmNdialogTitle, str(), // Roberto Cocchi - XmNiconName, title.c_str(), + XmNtitle, (const char*)title.mb_str(), + XmNdialogTitle, str(), + XmNiconName, (const char*)title.mb_str(), NULL ); } } bool wxDialog::Show( bool show ) { - if( !wxTopLevelWindowMotif::Show( show ) ) - return FALSE; + if( !wxWindowBase::Show( show ) ) + return false; + + if ( !show && IsModal() ) + EndModal(wxID_CANCEL); m_isShown = show; if (show) { - if (!wxUSE_INVISIBLE_RESIZE) - XtMapWidget(XtParent((Widget) m_mainWidget)); - else - XtManageChild((Widget)m_mainWidget) ; + if (CanDoLayoutAdaptation()) + DoLayoutAdaptation(); + + // this usually will result in TransferDataToWindow() being called + // which will change the controls values so do it before showing as + // otherwise we could have some flicker + InitDialog(); + } - XRaiseWindow( XtDisplay( (Widget)m_mainWidget ), + if (show) + { +#if !wxUSE_INVISIBLE_RESIZE + XtMapWidget(XtParent((Widget) m_mainWidget)); +#else + XtManageChild((Widget)m_mainWidget) ; +#endif + + XRaiseWindow( XtDisplay( (Widget)m_mainWidget ), XtWindow( (Widget)m_mainWidget) ); } else { - if (!wxUSE_INVISIBLE_RESIZE) - XtUnmapWidget(XtParent((Widget) m_mainWidget)); - else - XtUnmanageChild((Widget)m_mainWidget) ; +#if !wxUSE_INVISIBLE_RESIZE + XtUnmapWidget(XtParent((Widget) m_mainWidget)); +#else + XtUnmanageChild((Widget)m_mainWidget) ; +#endif - XFlush(XtDisplay((Widget) wxTheApp->GetTopLevelWidget())); - XSync(XtDisplay((Widget) wxTheApp->GetTopLevelWidget()), FALSE); + XFlush(XtDisplay((Widget)m_mainWidget)); + XSync(XtDisplay((Widget)m_mainWidget), False); } - return TRUE; + return true; } // Shows a dialog modally, returning a return code int wxDialog::ShowModal() { - m_windowStyle |= wxDIALOG_MODAL; + Show(true); - Show(TRUE); + // after the event loop ran, the widget might already have been destroyed + WXDisplay* display = (WXDisplay*)XtDisplay( (Widget)m_mainWidget ); if (m_modalShowing) return 0; + m_eventLoop = new wxEventLoop; - wxModalShowingStack.Insert((wxObject *)TRUE); + m_modalShowing = true; + XtAddGrab((Widget) m_mainWidget, True, False); - m_modalShowing = TRUE; - XtAddGrab((Widget) m_mainWidget, TRUE, FALSE); - - XEvent event; - - // Loop until we signal that the dialog should be closed - while ((wxModalShowingStack.Number() > 0) && ((int)(wxModalShowingStack.First()->Data()) != 0)) - { - // XtAppProcessEvent((XtAppContext) wxTheApp->GetAppContext(), XtIMAll); - - XtAppNextEvent((XtAppContext) wxTheApp->GetAppContext(), &event); - wxTheApp->ProcessXEvent((WXEvent*) &event); - - if (XtAppPending( (XtAppContext) wxTheApp->GetAppContext() ) == 0) - { - if (!wxTheApp->ProcessIdle()) - { -#if wxUSE_THREADS - // leave the main loop to give other threads a chance to - // perform their GUI work - wxMutexGuiLeave(); - wxUsleep(20); - wxMutexGuiEnter(); -#endif - } - } - } - - // Remove modal dialog flag from stack - wxNode *node = wxModalShowingStack.First(); - if (node) - delete node; + m_eventLoop->Run(); // Now process all events in case they get sent to a destroyed dialog - XSync(XtDisplay((Widget) wxTheApp->GetTopLevelWidget()), FALSE); - while (XtAppPending((XtAppContext) wxTheApp->GetAppContext())) - { - // MBN: is this necessary? why? - // XFlush(XtDisplay((Widget) wxTheApp->GetTopLevelWidget())); - XtAppNextEvent((XtAppContext) wxTheApp->GetAppContext(), &event); + wxFlushEvents( display ); - wxTheApp->ProcessXEvent((WXEvent*) &event); - } + delete m_eventLoop; + m_eventLoop = NULL; // TODO: is it safe to call this, if the dialog may have been deleted // by now? Probably only if we're using delayed deletion of dialogs. @@ -374,76 +325,12 @@ void wxDialog::EndModal(int retCode) // Strangely, we don't seem to need this now. // XtRemoveGrab((Widget) m_mainWidget); - Show(FALSE); - - m_modalShowing = FALSE; - - wxNode *node = wxModalShowingStack.First(); - if (node) - node->SetData((wxObject *)FALSE); -} - -// Standard buttons -void wxDialog::OnOK(wxCommandEvent& WXUNUSED(event)) -{ - if ( Validate() && TransferDataFromWindow() ) - { - if ( IsModal() ) - EndModal(wxID_OK); - else - { - SetReturnCode(wxID_OK); - this->Show(FALSE); - } - } -} - -void wxDialog::OnApply(wxCommandEvent& WXUNUSED(event)) -{ - if (Validate()) - TransferDataFromWindow(); - // TODO probably need to disable the Apply button until things change again -} + Show(false); -void wxDialog::OnCancel(wxCommandEvent& WXUNUSED(event)) -{ - if ( IsModal() ) - EndModal(wxID_CANCEL); - else - { - SetReturnCode(wxID_CANCEL); - this->Show(FALSE); - } -} - -void wxDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(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); + m_modalShowing = false; + m_eventLoop->Exit(); - wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL); - cancelEvent.SetEventObject( this ); - GetEventHandler()->ProcessEvent(cancelEvent); // This may close the dialog - - closing.DeleteObject(this); + SetModal(false); } // Destroy the window (delayed, if a managed window) @@ -451,13 +338,7 @@ bool wxDialog::Destroy() { if (!wxPendingDelete.Member(this)) wxPendingDelete.Append(this); - return TRUE; -} - -void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event)) -{ - SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)); - Refresh(); + return true; } void wxDialog::ChangeFont(bool keepOriginalSize) @@ -468,11 +349,11 @@ void wxDialog::ChangeFont(bool keepOriginalSize) void wxDialog::ChangeBackgroundColour() { if (GetMainWidget()) - DoChangeBackgroundColour(GetMainWidget(), m_backgroundColour); + wxDoChangeBackgroundColour(GetMainWidget(), m_backgroundColour); } void wxDialog::ChangeForegroundColour() { if (GetMainWidget()) - DoChangeForegroundColour(GetMainWidget(), m_foregroundColour); + wxDoChangeForegroundColour(GetMainWidget(), m_foregroundColour); }