Warning fix and source cleaning.

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

diff --git a/src/motif/dialog.cpp b/src/motif/dialog.cpp
index 5fdd39cb9fdfe59a43528735d581ce51d7e1654a..55d0b2fbef99f9ad42b28fb9b4868893d5d9f09f 100644 (file)
--- a/src/motif/dialog.cpp
+++ b/src/motif/dialog.cpp
@@ -9,10 +9,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "dialog.h"
 #endif
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
 #ifdef __VMS
 #define XtDisplay XTDISPLAY
 #define XtWindow XTWINDOW
@@ -24,6 +27,7 @@
 #include "wx/utils.h"
 #include "wx/app.h"
 #include "wx/settings.h"
+#include "wx/evtloop.h"
 
 #ifdef __VMS__
 #pragma message disable nosimpint
@@ -56,7 +60,7 @@
 // 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
@@ -81,6 +85,7 @@ END_EVENT_TABLE()
 wxDialog::wxDialog()
 {
     m_modalShowing = FALSE;
+    m_eventLoop = NULL;
     m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
 }
 
@@ -98,6 +103,7 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
         return FALSE;
 
     m_modalShowing = FALSE;
+    m_eventLoop = NULL;
 
     m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
     m_foregroundColour = *wxBLACK;
@@ -165,7 +171,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,
+                                     wxConstCast(name.c_str(), char),
                                      args, 2);
     m_mainWidget = (WXWidget) dialogShell;
 
@@ -190,7 +197,10 @@ bool wxDialog::DoCreate( wxWindow* parent, wxWindowID id,
 
 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 )
@@ -199,12 +209,17 @@ void wxDialog::SetModal(bool flag)
         wxModelessWindows.DeleteObject(this);
         if (!flag)
             wxModelessWindows.Append(this);
+#ifdef __VMS
+#pragma message enable codcauunr
+#endif
 }
 
 wxDialog::~wxDialog()
 {
     m_isBeingDeleted = TRUE;
 
+    delete m_eventLoop;
+
     if (m_mainWidget)
     {
         XtRemoveEventHandler((Widget) m_mainWidget, ExposureMask, FALSE,
@@ -216,6 +231,9 @@ wxDialog::~wxDialog()
     {
         XtUnmapWidget((Widget) m_mainWidget);
     }
+
+    PreDestroy();
+    DoDestroy();
 }
 
 void wxDialog::DoDestroy()
@@ -273,8 +291,8 @@ 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;
 
@@ -296,8 +314,8 @@ bool wxDialog::Show( bool show )
         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;
@@ -310,53 +328,23 @@ int wxDialog::ShowModal()
 
     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;
-
-    wxModalShowingStack.Insert((wxObject *)TRUE);
+    m_eventLoop = new wxEventLoop;
 
     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.
@@ -376,10 +364,7 @@ void wxDialog::EndModal(int retCode)
     Show(FALSE);
 
     m_modalShowing = FALSE;
-
-    wxNode *node = wxModalShowingStack.First();
-    if (node)
-        node->SetData((wxObject *)FALSE);
+    m_eventLoop->Exit();
 }
 
 // Standard buttons
@@ -467,11 +452,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);
 }