X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3ee937aad019ddae2987b03b88c922168e3984d7..15f0ad701496612df8c145e8e46d4b38515c0bbf:/src/x11/app.cpp?ds=inline diff --git a/src/x11/app.cpp b/src/x11/app.cpp index 3346119411..86d6447c63 100644 --- a/src/x11/app.cpp +++ b/src/x11/app.cpp @@ -243,6 +243,7 @@ wxApp::~wxApp() } #if !wxUSE_NANOX + //----------------------------------------------------------------------- // X11 predicate function for exposure compression //----------------------------------------------------------------------- @@ -253,7 +254,8 @@ struct wxExposeInfo Bool found_non_matching; }; -static Bool expose_predicate (Display *display, XEvent *xevent, XPointer arg) +extern "C" +Bool wxX11ExposePredicate (Display *display, XEvent *xevent, XPointer arg) { wxExposeInfo *info = (wxExposeInfo*) arg; @@ -274,8 +276,8 @@ static Bool expose_predicate (Display *display, XEvent *xevent, XPointer arg) return TRUE; } -#endif - // wxUSE_NANOX + +#endif // wxUSE_NANOX //----------------------------------------------------------------------- // Processes an X event, returning true if the event was processed. @@ -322,7 +324,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event) wxExposeInfo info; info.window = event->xexpose.window; info.found_non_matching = false; - while (XCheckIfEvent( wxGlobalDisplay(), &tmp_event, expose_predicate, (XPointer) &info )) + while (XCheckIfEvent( wxGlobalDisplay(), &tmp_event, wxX11ExposePredicate, (XPointer) &info )) { // Don't worry about optimizing redrawing the border etc. } @@ -341,7 +343,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event) wxExposeInfo info; info.window = event->xexpose.window; info.found_non_matching = false; - while (XCheckIfEvent( wxGlobalDisplay(), &tmp_event, expose_predicate, (XPointer) &info )) + while (XCheckIfEvent( wxGlobalDisplay(), &tmp_event, wxX11ExposePredicate, (XPointer) &info )) { win->GetUpdateRegion().Union( tmp_event.xexpose.x, tmp_event.xexpose.y, tmp_event.xexpose.width, tmp_event.xexpose.height );