Applied patch [ 736321 ] Compile error for src/msw/textctrl.cpp

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

diff --git a/src/motif/dialog.cpp b/src/motif/dialog.cpp
index def4c93d14be26d1b92caf0857ef79f4fd9e686c..a9a273a5f11380eb6d6b0614e87dd693d5b60f02 100644 (file)
--- a/src/motif/dialog.cpp
+++ b/src/motif/dialog.cpp
@@ -208,6 +208,7 @@ void wxDialog::SetModal(bool flag)
 wxDialog::~wxDialog()
 {
     m_isBeingDeleted = TRUE;
 wxDialog::~wxDialog()
 {
     m_isBeingDeleted = TRUE;

+

     delete m_eventLoop;
 
     if (m_mainWidget)
     delete m_eventLoop;
 
     if (m_mainWidget)


@@ -221,6 +222,9 @@ wxDialog::~wxDialog()
     {
         XtUnmapWidget((Widget) m_mainWidget);
     }
     {
         XtUnmapWidget((Widget) m_mainWidget);
     }

+
+    PreDestroy();
+    DoDestroy();

 }
 
 void wxDialog::DoDestroy()
 }
 
 void wxDialog::DoDestroy()


@@ -301,8 +305,8 @@ bool wxDialog::Show( bool show )
         else
             XtUnmanageChild((Widget)m_mainWidget) ;
 
         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;


@@ -315,6 +319,9 @@ int wxDialog::ShowModal()
 
     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;
     if (m_modalShowing)
         return 0;
     m_eventLoop = new wxEventLoop;


@@ -325,12 +332,7 @@ int wxDialog::ShowModal()
     m_eventLoop->Run();
 
     // Now process all events in case they get sent to a destroyed dialog
     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;
 
     delete m_eventLoop;
     m_eventLoop = NULL;


@@ -441,11 +443,11 @@ void wxDialog::ChangeFont(bool keepOriginalSize)
 void wxDialog::ChangeBackgroundColour()
 {
     if (GetMainWidget())
 void wxDialog::ChangeBackgroundColour()
 {
     if (GetMainWidget())

-        DoChangeBackgroundColour(GetMainWidget(), m_backgroundColour);
+        wxDoChangeBackgroundColour(GetMainWidget(), m_backgroundColour);

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

-        DoChangeForegroundColour(GetMainWidget(), m_foregroundColour);
+        wxDoChangeForegroundColour(GetMainWidget(), m_foregroundColour);

 }
 }