X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9ce8d6a2b0fec3ce3f6e838445fdea3445d2ce8d..bd4a25bc50eeac208fb0cfbbc21a88126d653209:/src/motif/app.cpp

diff --git a/src/motif/app.cpp b/src/motif/app.cpp
index 63cfd7ab1c..4fd539d71c 100644
--- a/src/motif/app.cpp
+++ b/src/motif/app.cpp
@@ -306,6 +306,9 @@ void wxApp::ExitMainLoop()
 // Is a message/event pending?
 bool wxApp::Pending()
 {
+<<<<<<< app.cpp
+    return XtAppPending( (XtAppContext) GetAppContext() ) != 0;
+=======
     return m_eventLoop->Pending();
 #if 0
     XFlush(XtDisplay( (Widget) wxTheApp->GetTopLevelWidget() ));
@@ -314,6 +317,7 @@ bool wxApp::Pending()
     // is found.
     return ((XtAppPending( (XtAppContext) GetAppContext() ) & XtIMXEvent) != 0) ;
 #endif
+>>>>>>> 1.57
 }
 
 // Dispatch a message.