Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed conflict markers.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20193 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2003-04-13 14:07:51 +00:00
parent 13c13ecbbf
commit a968cb805f
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/motif/app.cpp
View File

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