update frm Ivan Masar

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

diff --git a/src/motif/evtloop.cpp b/src/motif/evtloop.cpp
index 03049f43dac67e42757928a60e278aa81a3d23ac..9ed21e2ada25f42608dd81fc9644b7e2a18e79fa 100644 (file)
--- a/src/motif/evtloop.cpp
+++ b/src/motif/evtloop.cpp
@@ -17,29 +17,30 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

 #ifdef __VMS
 #define XtParent XTPARENT
 #define XtDisplay XTDISPLAY
 #endif
 
 #ifdef __VMS
 #define XtParent XTPARENT
 #define XtDisplay XTDISPLAY
 #endif
 

-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-

 #ifndef WX_PRECOMP
     #include "wx/event.h"
     #include "wx/app.h"
     #include "wx/window.h"
 #ifndef WX_PRECOMP
     #include "wx/event.h"
     #include "wx/app.h"
     #include "wx/window.h"

+    #include "wx/module.h"

 #endif //WX_PRECOMP
 
 #include "wx/evtloop.h"
 
 #ifdef __VMS__
 #endif //WX_PRECOMP
 
 #include "wx/evtloop.h"
 
 #ifdef __VMS__

-#pragma message disable nosimpint
+    #pragma message disable nosimpint

 #endif
 #include <Xm/Xm.h>
 #include <X11/Xlib.h>
 #ifdef __VMS__
 #endif
 #include <Xm/Xm.h>
 #include <X11/Xlib.h>
 #ifdef __VMS__

-#pragma message enable nosimpint
+    #pragma message enable nosimpint

 #endif
 
 #include "wx/unix/private.h"
 #endif
 
 #include "wx/unix/private.h"


@@ -121,6 +122,8 @@ int wxEventLoop::Run()
             break;
     }
 
             break;
     }
 

+    OnExit();
+

     int exitcode = m_impl->GetExitCode();
     delete m_impl;
     m_impl = NULL;
     int exitcode = m_impl->GetExitCode();
     delete m_impl;
     m_impl = NULL;


@@ -377,8 +380,6 @@ bool wxDoEventLoopIteration( wxEventLoop& evtLoop )
 // also wxEventLoop::Exit is implemented that way, so that exiting an
 // event loop won't require an event being in the queue
 
 // also wxEventLoop::Exit is implemented that way, so that exiting an
 // event loop won't require an event being in the queue
 

-#include "wx/module.h"
-

 #include <sys/types.h>
 #include <sys/time.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <unistd.h>