fix another memory leak in SetCommand() (coverity checker CID 52)

[wxWidgets.git] / src / motif / dialog.cpp

diff --git a/src/motif/dialog.cpp b/src/motif/dialog.cpp
index 4afc7bf1c0966e5dbbd11d313b62011ac62b34aa..cc38234f56bea14c3cd8776791559d5446a68396 100644 (file)
--- a/src/motif/dialog.cpp
+++ b/src/motif/dialog.cpp
@@ -1,24 +1,33 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dialog.cpp
+// Name:        src/motif/dialog.cpp

 // Purpose:     wxDialog class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxDialog class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "dialog.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#define XtWindow XTWINDOW
+#define XtParent XTPARENT
+#define XtScreen XTSCREEN

 #endif
 
 #include "wx/dialog.h"
 #include "wx/utils.h"
 #endif
 
 #include "wx/dialog.h"
 #include "wx/utils.h"

-#include "wx/frame.h"

 #include "wx/app.h"
 #include "wx/settings.h"
 #include "wx/app.h"
 #include "wx/settings.h"

+#include "wx/evtloop.h"

 
 

+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif

 #include <Xm/Xm.h>
 
 #include <X11/Shell.h>
 #include <Xm/Xm.h>
 
 #include <X11/Shell.h>


@@ -38,35 +47,28 @@
 #if   XmVersion > 1000
 #include <Xm/Protocols.h>
 #endif
 #if   XmVersion > 1000
 #include <Xm/Protocols.h>
 #endif

+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif

 
 #include "wx/motif/private.h"
 
 
 #include "wx/motif/private.h"
 

-static void wxCloseDialogCallback(Widget widget, XtPointer client_data, XmAnyCallbackStruct *cbs);
-static void wxDialogBoxRepaintProc(Widget w, XtPointer c_data, XEvent *event, char *);
-static void wxDialogBoxEventHandler (Widget    wid,
-                              XtPointer client_data,
-                              XEvent*   event,
-                              Boolean *continueToDispatch);
-
-static void wxUnmapBulletinBoard(Widget dialog, wxDialog *client,XtPointer call);
-

 // 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.
 // 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;
 
 // 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 wxModelessWindows;  // Frames and modeless dialogs

 extern wxList wxPendingDelete;
 
 #define wxUSE_INVISIBLE_RESIZE 1
 
 extern wxList wxPendingDelete;
 
 #define wxUSE_INVISIBLE_RESIZE 1
 

-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxPanel)
+IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)

 
 

-BEGIN_EVENT_TABLE(wxDialog, wxPanel)
+BEGIN_EVENT_TABLE(wxDialog, wxTopLevelWindow)

   EVT_BUTTON(wxID_OK, wxDialog::OnOK)
   EVT_BUTTON(wxID_APPLY, wxDialog::OnApply)
   EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel)
   EVT_BUTTON(wxID_OK, wxDialog::OnOK)
   EVT_BUTTON(wxID_APPLY, wxDialog::OnApply)
   EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel)


@@ -75,390 +77,243 @@ BEGIN_EVENT_TABLE(wxDialog, wxPanel)
   EVT_CLOSE(wxDialog::OnCloseWindow)
 END_EVENT_TABLE()
 
   EVT_CLOSE(wxDialog::OnCloseWindow)
 END_EVENT_TABLE()
 

-#endif

 
 wxDialog::wxDialog()
 {
 
 wxDialog::wxDialog()
 {

-    m_modalShowing = FALSE;
-    m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
+    m_modalShowing = false;
+    m_eventLoop = NULL;
+    m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);

 }
 
 bool wxDialog::Create(wxWindow *parent, wxWindowID id,
 }
 
 bool wxDialog::Create(wxWindow *parent, wxWindowID id,

-           const wxString& title,
-           const wxPoint& pos,
-           const wxSize& size,
-           long style,
-           const wxString& name)
+                      const wxString& title,
+                      const wxPoint& pos,
+                      const wxSize& size,
+                      long style,
+                      const wxString& name)

 {
 {

-    m_windowStyle = style;
-    m_modalShowing = FALSE;
-    m_dialogTitle = title;
+    SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG);

 
 

-    m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
-    m_foregroundColour = *wxBLACK;
+    if( !wxTopLevelWindow::Create( parent, id, title, pos, size, style,
+                                   name ) )
+        return false;

 
 

-    SetName(name);
-  
-    if (!parent)
-        wxTopLevelWindows.Append(this);
+    m_modalShowing = false;
+    m_eventLoop = NULL;

 
 

-    if (parent) parent->AddChild(this);
+    m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
+    m_foregroundColour = *wxBLACK;

 
 

-    if ( id == -1 )
-        m_windowId = (int)NewControlId();
-    else
-        m_windowId = id;
+    Widget dialogShell = (Widget) m_mainWidget;

 
 

-    Widget parentWidget = (Widget) 0;
-    if (parent)
-        parentWidget = (Widget) parent->GetTopWidget();
-    if (!parent)
-        parentWidget = (Widget) wxTheApp->GetTopLevelWidget();
+    SetTitle( title );

 
 

-    wxASSERT_MSG( (parentWidget != (Widget) 0), "Could not find a suitable parent shell for dialog." );
+    m_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
+    ChangeFont(false);

 
 

-    Arg args[1];
-    XtSetArg (args[0], XmNdefaultPosition, False);
-    Widget dialogShell = XmCreateBulletinBoardDialog(parentWidget, (char*) (const char*) name, args, 1);
-    m_mainWidget = (WXWidget) dialogShell;
+    // 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);

 
 

-    // We don't want margins, since there is enough elsewhere.
-    XtVaSetValues(dialogShell,
-          XmNmarginHeight,   0,
-          XmNmarginWidth,    0,
-          XmNresizePolicy, XmRESIZE_NONE,
-          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

     Widget shell = XtParent(dialogShell) ;
     Widget shell = XtParent(dialogShell) ;

-    if (!title.IsNull())
-    {
-        XmString str = XmStringCreateSimple((char*) (const char*)title);
-        XtVaSetValues(dialogShell,
-                      XmNdialogTitle, str,
-                      NULL);
-        XmStringFree(str);
-    }
-
-    m_windowFont = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
-    ChangeFont(FALSE);
-
-    wxAddWindowToTable(dialogShell, this);
-
-    // Intercept CLOSE messages from the window manager
-    Atom WM_DELETE_WINDOW = XmInternAtom(XtDisplay(shell), "WM_DELETE_WINDOW", False);
-
-    /* Remove and add WM_DELETE_WINDOW so ours is only handler */
-    /* Why do we have to do this for wxDialog, but not wxFrame? */
-    XmRemoveWMProtocols(shell, &WM_DELETE_WINDOW, 1);
-    XmAddWMProtocols(shell, &WM_DELETE_WINDOW, 1);
-    XmActivateWMProtocol(shell, WM_DELETE_WINDOW);
-
-    // Modified Steve Hammes for Motif 2.0
-#if (XmREVISION > 1 || XmVERSION > 1)
-    XmAddWMProtocolCallback(shell, WM_DELETE_WINDOW, (XtCallbackProc) wxCloseDialogCallback, (XtPointer)this);
-#elif XmREVISION == 1
-    XmAddWMProtocolCallback(shell, WM_DELETE_WINDOW, (XtCallbackProc) wxCloseDialogCallback, (caddr_t)this);
-#else
-    XmAddWMProtocolCallback(shell, WM_DELETE_WINDOW, (void (*)())wxCloseDialogCallback, (caddr_t)this);
+    XtVaSetValues(shell, XmNmappedWhenManaged, False, NULL);

 #endif
 
 #endif
 

-    XtTranslations ptr ;
-    XtOverrideTranslations(dialogShell,
-                ptr = XtParseTranslationTable("<Configure>: resize()"));
-    XtFree((char *)ptr);
+#if !wxUSE_INVISIBLE_RESIZE
+    XtManageChild(dialogShell);
+    SetSize(pos.x, pos.y, size.x, size.y);
+#endif

 
 

-    // Can't remember what this was about... but I think it's necessary.
+    XtAddEventHandler(dialogShell,ExposureMask,False,
+        wxUniversalRepaintProc, (XtPointer) this);

 
 

-    if (wxUSE_INVISIBLE_RESIZE)
-    {
-      if (pos.x > -1)
-        XtVaSetValues(dialogShell, XmNx, pos.x,
-                    NULL);
-      if (pos.y > -1)
-        XtVaSetValues(dialogShell, XmNy, pos.y,
-                    NULL);
+    ChangeBackgroundColour();

 
 

-      if (size.x > -1)
-        XtVaSetValues(dialogShell, XmNwidth, size.x, NULL);
-      if (size.y > -1)
-        XtVaSetValues(dialogShell, XmNheight, size.y, NULL);
-    }
+    return true;
+}

 
 

-    // This patch come from Torsten Liermann lier@lier1.muc.de
-    if (XmIsMotifWMRunning(shell))
-    {
-        int decor = 0 ;
-        if (m_windowStyle & wxRESIZE_BORDER)
-          decor |= MWM_DECOR_RESIZEH ;
-        if (m_windowStyle & wxSYSTEM_MENU)
-          decor |= MWM_DECOR_MENU;
-        if ((m_windowStyle & wxCAPTION) ||
-            (m_windowStyle & wxTINY_CAPTION_HORIZ) ||
-            (m_windowStyle & wxTINY_CAPTION_VERT))
-          decor |= MWM_DECOR_TITLE;
-        if (m_windowStyle & wxTHICK_FRAME)
-          decor |= MWM_DECOR_BORDER;
-        if (m_windowStyle & wxMINIMIZE_BOX)
-          decor |= MWM_DECOR_MINIMIZE;
-        if (m_windowStyle & wxMAXIMIZE_BOX)
-          decor |= MWM_DECOR_MAXIMIZE;
-
-        XtVaSetValues(shell,XmNmwmDecorations,decor,NULL) ;
-    }
-    // This allows non-Motif window managers to support at least the
-    // no-decorations case.
-    else
-    {
-      if ((m_windowStyle & wxCAPTION) != wxCAPTION)
-          XtVaSetValues((Widget) shell,XmNoverrideRedirect,TRUE,NULL);
-    }
+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 )
+        parentWidget = (Widget) parent->GetTopWidget();
+    if( !parent )
+        parentWidget = (Widget) wxTheApp->GetTopLevelWidget();

 
 

-    XtRealizeWidget(dialogShell);
+    wxASSERT_MSG( (parentWidget != (Widget) 0),
+                  "Could not find a suitable parent shell for dialog." );

 
 

-    XtAddCallback(dialogShell,XmNunmapCallback,
-                 (XtCallbackProc)wxUnmapBulletinBoard,this) ;
+    Arg args[2];
+    XtSetArg (args[0], XmNdefaultPosition, False);
+    XtSetArg (args[1], XmNautoUnmanage, False);
+    Widget dialogShell =
+        XmCreateBulletinBoardDialog( parentWidget,
+                                     wxConstCast(name.c_str(), char),
+                                     args, 2);
+    m_mainWidget = (WXWidget) dialogShell;

 
 

-    // 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);
+    // We don't want margins, since there is enough elsewhere.
+    XtVaSetValues( dialogShell,
+                   XmNmarginHeight,   0,
+                   XmNmarginWidth,    0,
+                   XmNresizePolicy, XmRESIZE_NONE,
+                   NULL ) ;

 
 

-    if (!wxUSE_INVISIBLE_RESIZE)
-    {
-        XtManageChild(dialogShell);
-        SetSize(pos.x, pos.y, size.x, size.y);
-    }
-    XtAddEventHandler(dialogShell,ExposureMask,FALSE,
-                          wxDialogBoxRepaintProc, (XtPointer) this);
+    XtTranslations ptr ;
+    XtOverrideTranslations(dialogShell,
+        ptr = XtParseTranslationTable("<Configure>: resize()"));
+    XtFree((char *)ptr);

 
 

-    XtAddEventHandler(dialogShell,
-       ButtonPressMask | ButtonReleaseMask | PointerMotionMask | KeyPressMask,
-       FALSE,
-       wxDialogBoxEventHandler,
-       (XtPointer)this);
+    XtRealizeWidget(dialogShell);

 
 

-    ChangeBackgroundColour();
+    wxAddWindowToTable( (Widget)m_mainWidget, this );

 
 

-    return TRUE;
+    return true;

 }
 
 void wxDialog::SetModal(bool flag)
 {
 }
 
 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()
 {
 }
 
 wxDialog::~wxDialog()
 {

-    m_modalShowing = FALSE;
-    if (!wxUSE_INVISIBLE_RESIZE && m_mainWidget)
+    m_isBeingDeleted = true;
+
+    delete m_eventLoop;
+
+    if (m_mainWidget)

     {
     {

-      XtUnmapWidget((Widget) m_mainWidget);
+        XtRemoveEventHandler((Widget) m_mainWidget, ExposureMask, False,
+                             wxUniversalRepaintProc, (XtPointer) this);

     }
 
     }
 

-    wxTopLevelWindows.DeleteObject(this);
-
-    if ( (GetWindowStyleFlag() & wxDIALOG_MODAL) != wxDIALOG_MODAL )
-      wxModelessWindows.DeleteObject(this);
+    m_modalShowing = false;

 
 

-    // If this is the last top-level window, exit.
-    if (wxTheApp && (wxTopLevelWindows.Number() == 0))
+#if !wxUSE_INVISIBLE_RESIZE
+    if (m_mainWidget)

     {
     {

-      wxTheApp->SetTopWindow(NULL);
-
-      if (wxTheApp->GetExitOnFrameDelete())
-      {
-         wxTheApp->ExitMainLoop();
-      }
+        XtUnmapWidget((Widget) m_mainWidget);

     }
     }

+#endif

 
 

-    // This event-flushing code used to be in wxWindow::PostDestroyChildren (wx_dialog.cpp)
-    // but I think this should work, if we destroy the children first.
-    // Note that this might need to be done for wxFrame also.
-    DestroyChildren();
+    PreDestroy();

 
 

-    // Now process all events, because otherwise
-    // this might remain on the screen.
-    Display* display;
-    if (m_mainWidget)
-      display = XtDisplay((Widget) m_mainWidget);
-    else
-      display = (Display*) wxGetDisplay();
-
-    XSync(display, FALSE);
-    XEvent event;
-    while (XtAppPending((XtAppContext) wxTheApp->GetAppContext())) {
-      XFlush(display);
-      XtAppNextEvent((XtAppContext) wxTheApp->GetAppContext(), &event);
-      XtDispatchEvent(&event);
+    if ( m_mainWidget )
+    {
+        wxDeleteWindowFromTable( (Widget)m_mainWidget );
+        XtDestroyWidget( (Widget)m_mainWidget );

     }
 }
 
 // By default, pressing escape cancels the dialog
 void wxDialog::OnCharHook(wxKeyEvent& event)
 {
     }
 }
 
 // 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::Iconize(bool WXUNUSED(iconize))
-{
-  // Can't iconize a dialog in Motif, apparently
-  // TODO: try using the parent of m_mainShell.
-//  XtVaSetValues((Widget) m_mainWidget, XmNiconic, iconize, NULL);
-}
-
-bool wxDialog::IsIconized() const
-{
-  /*
-    Boolean iconic;
-    XtVaGetValues((Widget) m_mainWidget, XmNiconic, &iconic, NULL);
+    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 iconic;
-   */
-    return FALSE;
+        return;
+    }
+    // We didn't process this event.
+    event.Skip();

 }
 
 }
 

-void wxDialog::SetSize(int x, int y, int width, int height, int sizeFlags)
+void wxDialog::DoSetSize(int x, int y, int width, int height, int sizeFlags)

 {
     XtVaSetValues((Widget) m_mainWidget, XmNresizePolicy, XmRESIZE_ANY, NULL);
 {
     XtVaSetValues((Widget) m_mainWidget, XmNresizePolicy, XmRESIZE_ANY, NULL);

-    wxWindow::SetSize(x, y, width, height, sizeFlags);
+    wxWindow::DoSetSize(x, y, width, height, sizeFlags);

     XtVaSetValues((Widget) m_mainWidget, XmNresizePolicy, XmRESIZE_NONE, NULL);
 }
 
     XtVaSetValues((Widget) m_mainWidget, XmNresizePolicy, XmRESIZE_NONE, NULL);
 }
 

-void wxDialog::SetClientSize(int width, int height)
+void wxDialog::DoSetClientSize(int width, int height)

 {
 {

-    SetSize(-1, -1, width, height);
+    wxWindow::SetSize(-1, -1, width, height);

 }
 
 }
 

-

 void wxDialog::SetTitle(const wxString& title)
 {
 void wxDialog::SetTitle(const wxString& title)
 {

-    m_dialogTitle = title;
-    if (!title.IsNull())
+    wxTopLevelWindow::SetTitle( title );
+
+    if( !title.empty() )

     {
     {

-        XmString str = XmStringCreateSimple((char*) (const char*) title);
-        XtVaSetValues((Widget) m_mainWidget, 
-                  XmNtitle, (char*) (const char*) title,
-                  XmNdialogTitle, str, // Roberto Cocchi
-                  XmNiconName, (char*) (const char*) title,
-                  NULL);
-        XmStringFree(str);
+        wxXmString str( title );
+        XtVaSetValues( (Widget)m_mainWidget,
+                       XmNtitle, title.c_str(),
+                       XmNdialogTitle, str(), // Roberto Cocchi
+                       XmNiconName, title.c_str(),
+                       NULL );

     }
 }
 
     }
 }
 

-wxString wxDialog::GetTitle() const
+bool wxDialog::Show( bool show )

 {
 {

-  return m_dialogTitle;
-}
+    if( !wxWindowBase::Show( show ) )
+        return false;

 
 

-void wxDialog::Centre(int direction)
-{
-  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 ;
-  }
-
-  GetSize(&width, &height);
-  GetPosition(&x, &y);
-
-  if (direction & wxHORIZONTAL)
-    x = (int)((display_width - width)/2);
-  if (direction & wxVERTICAL)
-    y = (int)((display_height - height)/2);
-
-  SetSize(x+x_offset, y+y_offset, width, height);
-}
-
-void wxDialog::Raise()
-{
-    Window parent_window = XtWindow((Widget) m_mainWidget),
-          next_parent   = XtWindow((Widget) m_mainWidget),
-          root          = RootWindowOfScreen(XtScreen((Widget) m_mainWidget));
-    // search for the parent that is child of ROOT, because the WM may
-    // reparent twice and notify only the next parent (like FVWM)
-    while (next_parent != root) {
-       Window *theChildren; unsigned int n;
-       parent_window = next_parent;
-       XQueryTree(XtDisplay((Widget) m_mainWidget), parent_window, &root,
-                  &next_parent, &theChildren, &n);
-       XFree(theChildren); // not needed
-    }
-    XRaiseWindow(XtDisplay((Widget) m_mainWidget), parent_window);
-}
+    m_isShown = show;

 
 

-void wxDialog::Lower()
-{
-    Window parent_window = XtWindow((Widget) m_mainWidget),
-          next_parent   = XtWindow((Widget) m_mainWidget),
-          root          = RootWindowOfScreen(XtScreen((Widget) m_mainWidget));
-    // search for the parent that is child of ROOT, because the WM may
-    // reparent twice and notify only the next parent (like FVWM)
-    while (next_parent != root) {
-       Window *theChildren; unsigned int n;
-       parent_window = next_parent;
-       XQueryTree(XtDisplay((Widget) m_mainWidget), parent_window, &root,
-                  &next_parent, &theChildren, &n);
-       XFree(theChildren); // not needed
+    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();

     }
     }

-    XLowerWindow(XtDisplay((Widget) m_mainWidget), parent_window);
-}
-
-bool wxDialog::Show(bool show)
-{
-    m_isShown = show;

 
     if (show)
     {
 
     if (show)
     {

-        if (!wxUSE_INVISIBLE_RESIZE)
-          XtMapWidget(XtParent((Widget) m_mainWidget));
-        else
-          XtManageChild((Widget) m_mainWidget) ; 
+#if !wxUSE_INVISIBLE_RESIZE
+        XtMapWidget(XtParent((Widget) m_mainWidget));
+#else
+        XtManageChild((Widget)m_mainWidget) ;
+#endif

 
 

-        XRaiseWindow(XtDisplay((Widget) m_mainWidget), XtWindow((Widget) m_mainWidget));
+        XRaiseWindow( XtDisplay( (Widget)m_mainWidget ),
+                      XtWindow( (Widget)m_mainWidget) );

 
     }
     else
     {
 
     }
     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
 }
 
 // Shows a dialog modally, returning a return code


@@ -466,36 +321,25 @@ int wxDialog::ShowModal()
 {
     m_windowStyle |= wxDIALOG_MODAL;
 
 {
     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;
 
     if (m_modalShowing)
         return 0;

+    m_eventLoop = new wxEventLoop;

 
 

-    wxModalShowingStack.Insert((wxObject *)TRUE);
-        
-    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) && (bool)wxModalShowingStack.First()->Data())
-    {
-        XtAppProcessEvent((XtAppContext) wxTheApp->GetAppContext(), XtIMAll);
-    }
+    m_modalShowing = true;
+    XtAddGrab((Widget) m_mainWidget, True, False);

 
 

-    // 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
 
     // 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);
-        XtDispatchEvent(&event);
-    }
+    wxFlushEvents( display );
+
+    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.
 
     // 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.


@@ -509,37 +353,37 @@ void wxDialog::EndModal(int retCode)
 
     SetReturnCode(retCode);
 
 
     SetReturnCode(retCode);
 

-    XtRemoveGrab((Widget) m_mainWidget);
+    // 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
 void wxDialog::OnOK(wxCommandEvent& WXUNUSED(event))
 {
 }
 
 // Standard buttons
 void wxDialog::OnOK(wxCommandEvent& WXUNUSED(event))
 {

-       if ( Validate() && TransferDataFromWindow() )
-       {
+    if ( Validate() && TransferDataFromWindow() )
+    {

         if ( IsModal() )
             EndModal(wxID_OK);
         else
         {
         if ( IsModal() )
             EndModal(wxID_OK);
         else
         {

-                   SetReturnCode(wxID_OK);
-                   this->Show(FALSE);
+            SetReturnCode(wxID_OK);
+            this->Show(false);

         }
         }

-       }
+    }

 }
 
 void wxDialog::OnApply(wxCommandEvent& WXUNUSED(event))
 {
 }
 
 void wxDialog::OnApply(wxCommandEvent& WXUNUSED(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& WXUNUSED(event))
 }
 
 void wxDialog::OnCancel(wxCommandEvent& WXUNUSED(event))


@@ -549,175 +393,67 @@ void wxDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
     else
     {
         SetReturnCode(wxID_CANCEL);
     else
     {
         SetReturnCode(wxID_CANCEL);

-               this->Show(FALSE);
+        this->Show(false);

     }
 }
 
     }
 }
 

-bool wxDialog::OnClose()
+void wxDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(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.
     // 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) )
 
     static wxList closing;
 
     if ( closing.Member(this) )

-        return FALSE;
+        return;

 
     closing.Append(this);
 
 
     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);
 
     closing.DeleteObject(this);

-
-       return FALSE;
-}
-
-void wxDialog::OnCloseWindow(wxCloseEvent& event)
-{
-    // Compatibility
-    if ( GetEventHandler()->OnClose() || event.GetForce())
-    {
-        this->Destroy();
-    }

 }
 
 // Destroy the window (delayed, if a managed window)
 bool wxDialog::Destroy()
 {
 }
 
 // Destroy the window (delayed, if a managed window)
 bool wxDialog::Destroy()
 {

-  if (!wxPendingDelete.Member(this))
-    wxPendingDelete.Append(this);
-  return TRUE;
+    if (!wxPendingDelete.Member(this))
+        wxPendingDelete.Append(this);
+    return true;

 }
 
 void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))
 {
 }
 
 void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))
 {

-  SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
-  Refresh();
-}
-
-void wxDialog::Fit()
-{
-}
-
-// Handle a close event from the window manager
-static void wxCloseDialogCallback( Widget WXUNUSED(widget), XtPointer client_data, 
-                                   XmAnyCallbackStruct *WXUNUSED(cbs))
-{
-  wxDialog *dialog = (wxDialog *)client_data;
-  wxCloseEvent closeEvent(wxEVT_CLOSE_WINDOW, dialog->GetId());
-  closeEvent.SetEventObject(dialog);
-
-  // May delete the dialog (with delayed deletion)
-  dialog->GetEventHandler()->ProcessEvent(closeEvent);
-}
-
-// TODO: Preferably, we should have a universal repaint proc.
-// Meanwhile, use a special one for dialogs.
-static void wxDialogBoxRepaintProc(Widget w, XtPointer WXUNUSED(c_data), XEvent *event, char *)
-{
-     Window window;
-     Display *display;
-
-     wxWindow* win = (wxWindow *)wxWidgetHashTable->Get((long)w);
-     if (!win)
-       return;
-
-     switch(event -> type)
-     {
-          case Expose :
-          {
-               window = (Window) win -> GetXWindow();
-               display = (Display *) win -> GetXDisplay();
-
-               wxRect* rect = new wxRect(event->xexpose.x, event->xexpose.y,
-                                       event->xexpose.width, event->xexpose.height);
-               win->m_updateRects.Append((wxObject*) rect);
-
-               if (event -> xexpose.count == 0)
-               {
-                    wxPaintEvent event(win->GetId());
-                    event.SetEventObject(win);
-                    win->GetEventHandler()->ProcessEvent(event);
-
-                    win->ClearUpdateRects();
-               }
-               break;
-         }
-        default :
-         {
-               cout << "\n\nNew Event ! is = " << event -> type << "\n";
-               break;
-         }
-     }
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
+    Refresh();

 }
 
 }
 

-static void wxDialogBoxEventHandler (Widget    wid,
-                              XtPointer WXUNUSED(client_data),
-                              XEvent*   event,
-                              Boolean *continueToDispatch)
+void wxDialog::ChangeFont(bool keepOriginalSize)

 {
 {

-  wxDialog *dialog = (wxDialog *)wxWidgetHashTable->Get((long)wid);
-  if (dialog)
-  {
-    wxMouseEvent wxevent(wxEVT_NULL);
-    if (wxTranslateMouseEvent(wxevent, dialog, wid, event))
-    {
-        wxevent.SetEventObject(dialog);
-        wxevent.SetId(dialog->GetId());
-        dialog->GetEventHandler()->ProcessEvent(wxevent);
-    }
-    else
-    {
-      // An attempt to implement OnCharHook by calling OnCharHook first;
-      // if this returns TRUE, set continueToDispatch to False
-      // (don't continue processing).
-      // Otherwise set it to True and call OnChar.
-      wxKeyEvent keyEvent(wxEVENT_TYPE_CHAR);
-      if (wxTranslateKeyEvent(keyEvent, dialog, wid, event))
-      {
-        keyEvent.SetEventObject(dialog);
-        keyEvent.SetId(dialog->GetId());
-        keyEvent.SetEventType(wxEVT_CHAR_HOOK);
-        if (dialog->GetEventHandler()->ProcessEvent(keyEvent))
-        {
-            *continueToDispatch = False;
-            return;
-        }
-        else
-        {
-            keyEvent.SetEventType(wxEVT_CHAR);
-            dialog->GetEventHandler()->ProcessEvent(keyEvent);
-       }
-      }
-    }
-  }
-  *continueToDispatch = True;
-}
-
-static void wxUnmapBulletinBoard(Widget WXUNUSED(dialog), wxDialog *WXUNUSED(client), XtPointer WXUNUSED(call) )
-{
-  /* This gets called when the dialog is being shown, which
-   * defeats modal showing.
-  client->m_modalShowing = FALSE ;
-  client->m_isShown = FALSE;
-  */
-}
-
-void wxDialog::ChangeFont(bool WXUNUSED(keepOriginalSize))
-{
-    // TODO
+    wxWindow::ChangeFont(keepOriginalSize);

 }
 
 void wxDialog::ChangeBackgroundColour()
 {
 }
 
 void wxDialog::ChangeBackgroundColour()
 {

-    // TODO
+    if (GetMainWidget())
+        wxDoChangeBackgroundColour(GetMainWidget(), m_backgroundColour);

 }
 
 void wxDialog::ChangeForegroundColour()
 {
 }
 
 void wxDialog::ChangeForegroundColour()
 {

-    // TODO
+    if (GetMainWidget())
+        wxDoChangeForegroundColour(GetMainWidget(), m_foregroundColour);

 }
 }

-