// 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
#include "wx/utils.h"
#include "wx/app.h"
#include "wx/settings.h"
+#include "wx/evtloop.h"
#ifdef __VMS__
#pragma message disable nosimpint
// 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
wxDialog::wxDialog()
{
- m_modalShowing = FALSE;
+ m_modalShowing = false;
+ m_eventLoop = NULL;
m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
}
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;
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)
// 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);
+ XtVaSetValues(shell, XmNmappedWhenManaged, False, NULL);
if (!wxUSE_INVISIBLE_RESIZE)
{
XtManageChild(dialogShell);
SetSize(pos.x, pos.y, size.x, size.y);
}
- XtAddEventHandler(dialogShell,ExposureMask,FALSE,
+ 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 id,
+ const wxString& title,
+ const wxPoint& pos,
+ const wxSize& size,
+ long style,
+ const wxString& name)
{
Widget parentWidget = (Widget) 0;
if( parent )
XtSetArg (args[0], XmNdefaultPosition, False);
XtSetArg (args[1], XmNautoUnmanage, False);
Widget dialogShell =
- XmCreateBulletinBoardDialog( parentWidget, (char*)name.c_str(),
+ XmCreateBulletinBoardDialog( parentWidget,
+ wxConstCast(name.c_str(), char),
args, 2);
m_mainWidget = (WXWidget) dialogShell;
wxAddWindowToTable( (Widget)m_mainWidget, this );
- return TRUE;
+ return true;
}
void wxDialog::SetModal(bool flag)
{
- if ( flag )
+#ifdef __VMS
+#pragma message disable codcauunr
+#endif
+ if ( flag )
m_windowStyle |= wxDIALOG_MODAL ;
else
if ( m_windowStyle & wxDIALOG_MODAL )
wxModelessWindows.DeleteObject(this);
if (!flag)
wxModelessWindows.Append(this);
+#ifdef __VMS
+#pragma message enable codcauunr
+#endif
}
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;
+ m_modalShowing = false;
if (!wxUSE_INVISIBLE_RESIZE && m_mainWidget)
{
XtUnmapWidget((Widget) m_mainWidget);
}
-}
-void wxDialog::DoDestroy()
-{
- if( m_mainWidget )
+ PreDestroy();
+
+ if ( m_mainWidget )
{
wxDeleteWindowFromTable( (Widget)m_mainWidget );
XtDestroyWidget( (Widget)m_mainWidget );
bool wxDialog::Show( bool show )
{
- if( !wxTopLevelWindowMotif::Show( show ) )
- return FALSE;
+ if( !wxWindowBase::Show( show ) )
+ return false;
m_isShown = show;
+ if (show)
+ {
+ // 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)
else
XtUnmanageChild((Widget)m_mainWidget) ;
- 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
{
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()))
- {
- 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.
// 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();
- wxNode *node = wxModalShowingStack.First();
- if (node)
- node->SetData((wxObject *)FALSE);
+ SetModal(false);
}
// Standard buttons
else
{
SetReturnCode(wxID_OK);
- this->Show(FALSE);
+ this->Show(false);
}
}
}
else
{
SetReturnCode(wxID_CANCEL);
- this->Show(FALSE);
+ this->Show(false);
}
}
{
if (!wxPendingDelete.Member(this))
wxPendingDelete.Append(this);
- return TRUE;
+ return true;
}
void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))
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);
}
projects / wxWidgets.git / blobdiff