Fix to parser.y to make it compile with makefile.unx; wxFileConfig

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

diff --git a/src/motif/app.cpp b/src/motif/app.cpp
index 8c006f4e9a97a6bb9f72bb9227ebe739482a6ea5..79e667aa01ffbf186c9b2e705b4b5d98f1a07161 100644 (file)
--- a/src/motif/app.cpp
+++ b/src/motif/app.cpp
@@ -197,6 +197,14 @@ int wxEntry( int argc, char *argv[] )
   
     if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun();
 
+    // flush the logged messages if any
+    wxLog *pLog = wxLog::GetActiveTarget();
+    if ( pLog != NULL && pLog->HasPendingMessages() )
+      pLog->Flush();
+
+    delete wxLog::SetActiveTarget(new wxLogStderr); // So dialog boxes aren't used
+                                   // for further messages
+
     if (wxTheApp->GetTopWindow())
     {
       delete wxTheApp->GetTopWindow();
@@ -206,6 +214,7 @@ int wxEntry( int argc, char *argv[] )
     wxTheApp->DeletePendingObjects();
   
     wxTheApp->OnExit();
+
   
     wxApp::CleanUp();
 
@@ -294,7 +303,7 @@ void wxApp::ProcessXEvent(WXEvent* _event)
 {
     XEvent* event = (XEvent*) _event;
 
-    if (CheckForAccelerator(_event))
+    if ((event->type == KeyPress) && CheckForAccelerator(_event))
     {
         // Do nothing! We intercepted and processed the event as an accelerator.
         return;