X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2187eef5bb7a81ee3b2738a312f4ecfceb49bded..957eca2f20bedbd7ca13cc7128b2160ee81a4104:/src/motif/dialog.cpp diff --git a/src/motif/dialog.cpp b/src/motif/dialog.cpp index ab5c7eeccc..22dc5a65f8 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,9 +9,8 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "dialog.h" -#endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" #ifdef __VMS #define XtDisplay XTDISPLAY @@ -21,8 +20,12 @@ #endif #include "wx/dialog.h" -#include "wx/utils.h" -#include "wx/app.h" + +#ifndef WX_PRECOMP + #include "wx/app.h" + #include "wx/utils.h" +#endif + #include "wx/settings.h" #include "wx/evtloop.h" @@ -70,18 +73,18 @@ extern wxList wxPendingDelete; 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) + 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_modalShowing = false; m_eventLoop = NULL; m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); } @@ -97,63 +100,64 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id, if( !wxTopLevelWindow::Create( parent, id, title, pos, size, style, name ) ) - return FALSE; + return false; - m_modalShowing = FALSE; + m_modalShowing = false; m_eventLoop = NULL; m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); m_foregroundColour = *wxBLACK; Widget dialogShell = (Widget) m_mainWidget; - Widget shell = XtParent(dialogShell) ; SetTitle( title ); m_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); - ChangeFont(FALSE); + 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(); - 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 ) @@ -189,47 +193,41 @@ 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; 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 PreDestroy(); - DoDestroy(); -} -void wxDialog::DoDestroy() -{ - if( m_mainWidget ) + if ( m_mainWidget ) { wxDeleteWindowFromTable( (Widget)m_mainWidget ); XtDestroyWidget( (Widget)m_mainWidget ); @@ -282,59 +280,65 @@ void wxDialog::SetTitle(const wxString& title) bool wxDialog::Show( bool show ) { - if( !wxTopLevelWindowMotif::Show( show ) ) - return FALSE; + if( !wxWindowBase::Show( show ) ) + return false; m_isShown = show; if (show) { - if (!wxUSE_INVISIBLE_RESIZE) - XtMapWidget(XtParent((Widget) m_mainWidget)); - else - XtManageChild((Widget)m_mainWidget) ; + // 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(); + } + + if (show) + { +#if !wxUSE_INVISIBLE_RESIZE + XtMapWidget(XtParent((Widget) m_mainWidget)); +#else + XtManageChild((Widget)m_mainWidget) ; +#endif - XRaiseWindow( XtDisplay( (Widget)m_mainWidget ), + 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; - m_modalShowing = TRUE; - XtAddGrab((Widget) m_mainWidget, TRUE, FALSE); + m_modalShowing = true; + XtAddGrab((Widget) m_mainWidget, True, False); m_eventLoop->Run(); // Now process all events in case they get sent to a destroyed dialog - XSync(XtDisplay((Widget) wxTheApp->GetTopLevelWidget()), FALSE); - while (m_eventLoop->Pending()) - { - XFlush(XtDisplay((Widget) wxTheApp->GetTopLevelWidget())); - m_eventLoop->Dispatch(); - } + wxFlushEvents( display ); delete m_eventLoop; m_eventLoop = NULL; @@ -354,10 +358,12 @@ void wxDialog::EndModal(int retCode) // Strangely, we don't seem to need this now. // XtRemoveGrab((Widget) m_mainWidget); - Show(FALSE); + Show(false); - m_modalShowing = FALSE; + m_modalShowing = false; m_eventLoop->Exit(); + + SetModal(false); } // Standard buttons @@ -370,7 +376,7 @@ void wxDialog::OnOK(wxCommandEvent& WXUNUSED(event)) else { SetReturnCode(wxID_OK); - this->Show(FALSE); + this->Show(false); } } } @@ -389,7 +395,7 @@ void wxDialog::OnCancel(wxCommandEvent& WXUNUSED(event)) else { SetReturnCode(wxID_CANCEL); - this->Show(FALSE); + this->Show(false); } } @@ -428,7 +434,7 @@ bool wxDialog::Destroy() { if (!wxPendingDelete.Member(this)) wxPendingDelete.Append(this); - return TRUE; + return true; } void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event)) @@ -445,11 +451,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); }