X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b886fae6484edbb3a2fdbe8be74b3a840e9c84ee..850df2d78866c3edcf848103b5dbc7e7fa1ee5fa:/src/x11/app.cpp

diff --git a/src/x11/app.cpp b/src/x11/app.cpp
index 2d35f3b630..c7ec2a5de7 100644
--- a/src/x11/app.cpp
+++ b/src/x11/app.cpp
@@ -22,7 +22,6 @@
     #include "wx/frame.h"
     #include "wx/icon.h"
     #include "wx/dialog.h"
-    #include "wx/timer.h"
     #include "wx/memory.h"
     #include "wx/gdicmn.h"
     #include "wx/module.h"
@@ -33,6 +32,7 @@
 
 #include "wx/univ/theme.h"
 #include "wx/univ/renderer.h"
+#include "wx/generic/private/timer.h"
 
 #if wxUSE_THREADS
     #include "wx/thread.h"
@@ -86,10 +86,6 @@ long wxApp::sm_lastMessageTime = 0;
 
 IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
 
-BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
-    EVT_IDLE(wxAppBase::OnIdle)
-END_EVENT_TABLE()
-
 bool wxApp::Initialize(int& argC, wxChar **argV)
 {
 #if defined(__WXDEBUG__) && !wxUSE_NANOX
@@ -241,7 +237,7 @@ struct wxExposeInfo
 };
 
 extern "C"
-Bool wxX11ExposePredicate (Display *display, XEvent *xevent, XPointer arg)
+Bool wxX11ExposePredicate (Display *WXUNUSED(display), XEvent *xevent, XPointer arg)
 {
     wxExposeInfo *info = (wxExposeInfo*) arg;
 
@@ -398,8 +394,8 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
             keyEvent.SetEventType(wxEVT_CHAR);
             // Do the translation again, retaining the ASCII
             // code.
-            wxTranslateKeyEvent(keyEvent, win, window, event, true);
-            if (win->GetEventHandler()->ProcessEvent( keyEvent ))
+            if (wxTranslateKeyEvent(keyEvent, win, window, event, true) &&
+                win->GetEventHandler()->ProcessEvent( keyEvent ))
                 return true;
 
             if ( (keyEvent.m_keyCode == WXK_TAB) &&
@@ -544,7 +540,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
 
             if (event->type == ButtonPress)
             {
-                if ((win != wxWindow::FindFocus()) && win->AcceptsFocus())
+                if ((win != wxWindow::FindFocus()) && win->CanAcceptFocus())
                 {
                     // This might actually be done in wxWindow::SetFocus()
                     // and not here. TODO.
@@ -634,7 +630,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
 
 // This should be redefined in a derived class for
 // handling property change events for XAtom IPC.
-bool wxApp::HandlePropertyChange(WXEvent *event)
+bool wxApp::HandlePropertyChange(WXEvent *WXUNUSED(event))
 {
     // by default do nothing special
     // TODO: what to do for X11
@@ -796,7 +792,7 @@ bool wxApp::Yield(bool onlyIfNeeded)
 
         // Make sure we have an event loop object,
         // or Pending/Dispatch will fail
-        wxEventLoop* eventLoop = wxEventLoop::GetActive();
+        wxEventLoopBase * const eventLoop = wxEventLoop::GetActive();
         wxEventLoop* newEventLoop = NULL;
         if (!eventLoop)
         {
@@ -812,7 +808,7 @@ bool wxApp::Yield(bool onlyIfNeeded)
             wxTheApp->Dispatch();
 
 #if wxUSE_TIMER
-        wxTimer::NotifyTimers();
+        wxGenericTimerImpl::NotifyTimers();
 #endif
         ProcessIdle();