Replace dc.cpp with dc.mm and dcclient.cpp with dc.mm

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

diff --git a/src/motif/dialog.cpp b/src/motif/dialog.cpp
index 30b03d55b202409bac1b13d0fa6c218d92d85d05..ab5c7eecccb02f5f792a5230385a0a03ca690db9 100644 (file)
--- a/src/motif/dialog.cpp
+++ b/src/motif/dialog.cpp
@@ -6,19 +6,29 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 #pragma implementation "dialog.h"
 #endif
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 #pragma implementation "dialog.h"
 #endif
 

+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#define XtWindow XTWINDOW
+#define XtParent XTPARENT
+#define XtScreen XTSCREEN
+#endif
+

 #include "wx/dialog.h"
 #include "wx/utils.h"
 #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,49 +48,42 @@
 #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)
-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)
+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()
 
 END_EVENT_TABLE()
 

-#endif

 
 wxDialog::wxDialog()
 {
     m_modalShowing = FALSE;
 
 wxDialog::wxDialog()
 {
     m_modalShowing = FALSE;

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

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


@@ -90,86 +93,27 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
                       long style,
                       const wxString& name)
 {
                       long style,
                       const wxString& name)
 {

-    m_windowStyle = style;
+    SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG);
+
+    if( !wxTopLevelWindow::Create( parent, id, title, pos, size, style,
+                                   name ) )
+        return FALSE;
+

     m_modalShowing = FALSE;
     m_modalShowing = FALSE;

-    m_dialogTitle = title;
-    
-    m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
+    m_eventLoop = NULL;
+
+    m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);

     m_foregroundColour = *wxBLACK;
     m_foregroundColour = *wxBLACK;

-    
-    SetName(name);
-    
-    if (!parent)
-        wxTopLevelWindows.Append(this);
-    
-    if (parent) parent->AddChild(this);
-    
-    if ( id == -1 )
-        m_windowId = (int)NewControlId();
-    else
-        m_windowId = id;
-    
-    Widget parentWidget = (Widget) 0;
-    if (parent)
-        parentWidget = (Widget) parent->GetTopWidget();
-    if (!parent)
-        parentWidget = (Widget) wxTheApp->GetTopLevelWidget();
-    
-    wxASSERT_MSG( (parentWidget != (Widget) 0), "Could not find a suitable parent shell for dialog." );
-    
-    Arg args[2];
-    XtSetArg (args[0], XmNdefaultPosition, False);
-    XtSetArg (args[1], XmNautoUnmanage, False);
-    Widget dialogShell = XmCreateBulletinBoardDialog(parentWidget, (char*) (const char*) name, args, 2);
-    m_mainWidget = (WXWidget) dialogShell;
-    
-    // We don't want margins, since there is enough elsewhere.
-    XtVaSetValues(dialogShell,
-        XmNmarginHeight,   0,
-        XmNmarginWidth,    0,
-        XmNresizePolicy, XmRESIZE_NONE,
-        NULL) ;
-    
+
+    Widget dialogShell = (Widget) m_mainWidget;

     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);
+
+    SetTitle( title );
+
+    m_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);

     ChangeFont(FALSE);
     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);
-#endif
-    
-    XtTranslations ptr ;
-    XtOverrideTranslations(dialogShell,
-        ptr = XtParseTranslationTable("<Configure>: resize()"));
-    XtFree((char *)ptr);
-    
+

     // Can't remember what this was about... but I think it's necessary.
     // Can't remember what this was about... but I think it's necessary.

-    

     if (wxUSE_INVISIBLE_RESIZE)
     {
         if (pos.x > -1)
     if (wxUSE_INVISIBLE_RESIZE)
     {
         if (pos.x > -1)


@@ -178,69 +122,73 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
         if (pos.y > -1)
             XtVaSetValues(dialogShell, XmNy, pos.y,
             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 (size.x > -1)
             XtVaSetValues(dialogShell, XmNwidth, size.x, NULL);
         if (size.y > -1)
             XtVaSetValues(dialogShell, XmNheight, size.y, NULL);
     }

-    
-    // 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);
-    }
-    
-    XtRealizeWidget(dialogShell);
-    
-    XtAddCallback(dialogShell,XmNunmapCallback,
-        (XtCallbackProc)wxUnmapBulletinBoard,this) ;
-    
+

     // 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);
     // 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)
     {
         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);
     }
     XtAddEventHandler(dialogShell,ExposureMask,FALSE,

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

     ChangeBackgroundColour();
     ChangeBackgroundColour();

-    
+
+    return TRUE;
+}
+
+bool wxDialog::DoCreate( wxWindow* parent, wxWindowID id,
+                         const wxString& title,
+                         const wxPoint& pos,
+                         const wxSize& size,
+                         long style,
+                         const wxString& name )
+{
+    Widget parentWidget = (Widget) 0;
+    if( parent )
+        parentWidget = (Widget) parent->GetTopWidget();
+    if( !parent )
+        parentWidget = (Widget) wxTheApp->GetTopLevelWidget();
+
+    wxASSERT_MSG( (parentWidget != (Widget) 0),
+                  "Could not find a suitable parent shell for dialog." );
+
+    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;
+
+    // We don't want margins, since there is enough elsewhere.
+    XtVaSetValues( dialogShell,
+                   XmNmarginHeight,   0,
+                   XmNmarginWidth,    0,
+                   XmNresizePolicy, XmRESIZE_NONE,
+                   NULL ) ;
+
+    XtTranslations ptr ;
+    XtOverrideTranslations(dialogShell,
+        ptr = XtParseTranslationTable("<Configure>: resize()"));
+    XtFree((char *)ptr);
+
+    XtRealizeWidget(dialogShell);
+
+    wxAddWindowToTable( (Widget)m_mainWidget, this );
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -251,7 +199,7 @@ void wxDialog::SetModal(bool flag)
     else
         if ( m_windowStyle & wxDIALOG_MODAL )
             m_windowStyle -= wxDIALOG_MODAL ;
     else
         if ( m_windowStyle & wxDIALOG_MODAL )
             m_windowStyle -= wxDIALOG_MODAL ;

-        
+

         wxModelessWindows.DeleteObject(this);
         if (!flag)
             wxModelessWindows.Append(this);
         wxModelessWindows.DeleteObject(this);
         if (!flag)
             wxModelessWindows.Append(this);


@@ -259,41 +207,32 @@ void wxDialog::SetModal(bool flag)
 
 wxDialog::~wxDialog()
 {
 
 wxDialog::~wxDialog()
 {

+    m_isBeingDeleted = TRUE;
+
+    delete m_eventLoop;
+
+    if (m_mainWidget)
+    {
+        XtRemoveEventHandler((Widget) m_mainWidget, ExposureMask, FALSE,
+                             wxUniversalRepaintProc, (XtPointer) this);
+    }
+

     m_modalShowing = FALSE;
     if (!wxUSE_INVISIBLE_RESIZE && m_mainWidget)
     {
         XtUnmapWidget((Widget) m_mainWidget);
     }
     m_modalShowing = FALSE;
     if (!wxUSE_INVISIBLE_RESIZE && m_mainWidget)
     {
         XtUnmapWidget((Widget) m_mainWidget);
     }

-    
-    wxTopLevelWindows.DeleteObject(this);
-    
-    if ( (GetWindowStyleFlag() & wxDIALOG_MODAL) != wxDIALOG_MODAL )
-        wxModelessWindows.DeleteObject(this);
-    
-    // If this is the last top-level window, exit.
-    if (wxTheApp && (wxTopLevelWindows.Number() == 0))
-    {
-        wxTheApp->SetTopWindow(NULL);
-        
-        if (wxTheApp->GetExitOnFrameDelete())
-        {
-            wxTheApp->ExitMainLoop();
-        }
-    }
-    
-    // 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();
-
-    // The idea about doing it here is that if you have to remove the
-    // XtDestroyWidget from ~wxWindow, at least top-level windows
-    // will still be deleted (and destroy children implicitly).
-    if (GetMainWidget())
+
+    PreDestroy();
+    DoDestroy();
+}
+
+void wxDialog::DoDestroy()
+{
+    if( m_mainWidget )

     {
     {

-      DetachWidget(GetMainWidget()); // Removes event handlers
-      XtDestroyWidget((Widget) GetMainWidget());
-      SetMainWidget((WXWidget) NULL);
+        wxDeleteWindowFromTable( (Widget)m_mainWidget );
+        XtDestroyWidget( (Widget)m_mainWidget );

     }
 }
 
     }
 }
 


@@ -307,152 +246,69 @@ void wxDialog::OnCharHook(wxKeyEvent& event)
         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);

-        
+

         return;
     }
     // We didn't process this event.
     event.Skip();
 }
 
         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);
-
-  return iconic;
-    */
-    return FALSE;
-}
-
-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())
-    {
-        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);
-    }
-}
-
-wxString wxDialog::GetTitle() const
-{
-    return m_dialogTitle;
-}
+    wxTopLevelWindow::SetTitle( title );

 
 

-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
+    if( !title.empty() )

     {
     {

-        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
+        wxXmString str( title );
+        XtVaSetValues( (Widget)m_mainWidget,
+                       XmNtitle, title.c_str(),
+                       XmNdialogTitle, str(), // Roberto Cocchi
+                       XmNiconName, title.c_str(),
+                       NULL );

     }
     }

-    XRaiseWindow(XtDisplay((Widget) m_mainWidget), parent_window);

 }
 
 }
 

-void wxDialog::Lower()
+bool wxDialog::Show( bool show )

 {
 {

-    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
-    }
-    XLowerWindow(XtDisplay((Widget) m_mainWidget), parent_window);
-}
+    if( !wxTopLevelWindowMotif::Show( show ) )
+        return FALSE;

 
 

-bool wxDialog::Show(bool show)
-{

     m_isShown = show;
     m_isShown = show;

-    
+

     if (show)
     {
         if (!wxUSE_INVISIBLE_RESIZE)
             XtMapWidget(XtParent((Widget) m_mainWidget));
         else
     if (show)
     {
         if (!wxUSE_INVISIBLE_RESIZE)
             XtMapWidget(XtParent((Widget) m_mainWidget));
         else

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

     }
     else
     {
         if (!wxUSE_INVISIBLE_RESIZE)
             XtUnmapWidget(XtParent((Widget) m_mainWidget));
         else
     }
     else
     {
         if (!wxUSE_INVISIBLE_RESIZE)
             XtUnmapWidget(XtParent((Widget) m_mainWidget));
         else

-            XtUnmanageChild((Widget) m_mainWidget) ;
-        
+            XtUnmanageChild((Widget)m_mainWidget) ;
+

         XFlush(XtDisplay((Widget) wxTheApp->GetTopLevelWidget()));
         XSync(XtDisplay((Widget) wxTheApp->GetTopLevelWidget()), FALSE);
     }
         XFlush(XtDisplay((Widget) wxTheApp->GetTopLevelWidget()));
         XSync(XtDisplay((Widget) wxTheApp->GetTopLevelWidget()), FALSE);
     }

-    
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -460,43 +316,29 @@ bool wxDialog::Show(bool show)
 int wxDialog::ShowModal()
 {
     m_windowStyle |= wxDIALOG_MODAL;
 int wxDialog::ShowModal()
 {
     m_windowStyle |= wxDIALOG_MODAL;

-    
+

     Show(TRUE);
     Show(TRUE);

-    
+

     if (m_modalShowing)
         return 0;
     if (m_modalShowing)
         return 0;

-    
-    wxModalShowingStack.Insert((wxObject *)TRUE);
-    
+    m_eventLoop = new wxEventLoop;
+

     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);
-    }
-    
-    // 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);
     // Now process all events in case they get sent to a destroyed dialog
     XSync(XtDisplay((Widget) wxTheApp->GetTopLevelWidget()), FALSE);

-    while (XtAppPending((XtAppContext) wxTheApp->GetAppContext()))
+    while (m_eventLoop->Pending())

     {
         XFlush(XtDisplay((Widget) wxTheApp->GetTopLevelWidget()));
     {
         XFlush(XtDisplay((Widget) wxTheApp->GetTopLevelWidget()));

-        XtAppNextEvent((XtAppContext) wxTheApp->GetAppContext(), &event);
-        
-        wxTheApp->ProcessXEvent((WXEvent*) &event);
+        m_eventLoop->Dispatch();

     }
     }

-    
+
+    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.
     return GetReturnCode();
     // 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.
     return GetReturnCode();


@@ -506,19 +348,16 @@ void wxDialog::EndModal(int retCode)
 {
     if (!m_modalShowing)
         return;
 {
     if (!m_modalShowing)
         return;

-    
+

     SetReturnCode(retCode);
     SetReturnCode(retCode);

-    
+

     // Strangely, we don't seem to need this now.
     //    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;

-    
-    wxNode *node = wxModalShowingStack.First();
-    if (node)
-        node->SetData((wxObject *)FALSE);
+    m_eventLoop->Exit();

 }
 
 // Standard buttons
 }
 
 // Standard buttons


@@ -554,7 +393,7 @@ void wxDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
     }
 }
 
     }
 }
 

-void wxDialog::OnCloseWindow(wxCloseEvent& event)
+void wxDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))

 {
     // We'll send a Cancel message by default,
     // which may close the dialog.
 {
     // We'll send a Cancel message by default,
     // which may close the dialog.


@@ -571,12 +410,12 @@ void wxDialog::OnCloseWindow(wxCloseEvent& event)
     // The default OnCancel (above) simply ends a modal dialog, and hides a modeless dialog.
 
     static wxList closing;
     // The default OnCancel (above) simply ends a modal dialog, and hides a modeless dialog.
 
     static wxList closing;

-    
+

     if ( closing.Member(this) )
         return;
     if ( closing.Member(this) )
         return;

-    
+

     closing.Append(this);
     closing.Append(this);

-    
+

     wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
     cancelEvent.SetEventObject( this );
     GetEventHandler()->ProcessEvent(cancelEvent); // This may close the dialog
     wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
     cancelEvent.SetEventObject( this );
     GetEventHandler()->ProcessEvent(cancelEvent); // This may close the dialog


@@ -594,125 +433,10 @@ bool wxDialog::Destroy()
 
 void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))
 {
 
 void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))
 {

-    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));

     Refresh();
 }
 
     Refresh();
 }
 

-void wxDialog::Fit()
-{
-    wxWindow::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)
-            {
-                win->DoPaint();
-                
-                win->ClearUpdateRects();
-            }
-            break;
-        }
-    default :
-        {
-            cout << "\n\nNew Event ! is = " << event -> type << "\n";
-            break;
-        }
-    }
-}
-
-static void wxDialogBoxEventHandler (Widget    wid,
-                                     XtPointer WXUNUSED(client_data),
-                                     XEvent*   event,
-                                     Boolean *continueToDispatch)
-{
-    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(wxEVT_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
-                {
-                    // For simplicity, OnKeyDown is the same as OnChar
-                    // TODO: filter modifier key presses from OnChar
-                    keyEvent.SetEventType(wxEVT_KEY_DOWN);
-
-                    // Only process OnChar if OnKeyDown didn't swallow it
-                    if (!dialog->GetEventHandler()->ProcessEvent (keyEvent))
-                    {
-                        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 keepOriginalSize)
 {
     wxWindow::ChangeFont(keepOriginalSize);
 void wxDialog::ChangeFont(bool keepOriginalSize)
 {
     wxWindow::ChangeFont(keepOriginalSize);


@@ -729,4 +453,3 @@ void wxDialog::ChangeForegroundColour()
     if (GetMainWidget())
         DoChangeForegroundColour(GetMainWidget(), m_foregroundColour);
 }
     if (GetMainWidget())
         DoChangeForegroundColour(GetMainWidget(), m_foregroundColour);
 }

-