provide backward-compat wxCursor(int) ctor; remove empty stubs of XBM ctor from all...

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

diff --git a/src/x11/app.cpp b/src/x11/app.cpp
index a7165cf5ec4bf93fb828bf008bf770b959a20dfc..4c9868ce0c98d82ce22c26087c671eb3912a98af 100644 (file)
--- a/src/x11/app.cpp
+++ b/src/x11/app.cpp
@@ -22,10 +22,10 @@
     #include "wx/frame.h"
     #include "wx/icon.h"
     #include "wx/dialog.h"
     #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"
     #include "wx/memory.h"
     #include "wx/gdicmn.h"
     #include "wx/module.h"

+    #include "wx/crt.h"

 #endif
 
 #include "wx/evtloop.h"
 #endif
 
 #include "wx/evtloop.h"


@@ -33,6 +33,7 @@
 
 #include "wx/univ/theme.h"
 #include "wx/univ/renderer.h"
 
 #include "wx/univ/theme.h"
 #include "wx/univ/renderer.h"

+#include "wx/generic/private/timer.h"

 
 #if wxUSE_THREADS
     #include "wx/thread.h"
 
 #if wxUSE_THREADS
     #include "wx/thread.h"


@@ -86,10 +87,6 @@ long wxApp::sm_lastMessageTime = 0;
 
 IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
 
 
 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
 bool wxApp::Initialize(int& argC, wxChar **argV)
 {
 #if defined(__WXDEBUG__) && !wxUSE_NANOX


@@ -241,7 +238,7 @@ struct wxExposeInfo
 };
 
 extern "C"
 };
 
 extern "C"

-Bool wxX11ExposePredicate (Display *display, XEvent *xevent, XPointer arg)
+Bool wxX11ExposePredicate (Display *WXUNUSED(display), XEvent *xevent, XPointer arg)

 {
     wxExposeInfo *info = (wxExposeInfo*) arg;
 
 {
     wxExposeInfo *info = (wxExposeInfo*) arg;
 


@@ -392,14 +389,14 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
             // wxLogDebug( "OnKey from %s", win->GetName().c_str() );
 
             // We didn't process wxEVT_KEY_DOWN, so send wxEVT_CHAR
             // wxLogDebug( "OnKey from %s", win->GetName().c_str() );
 
             // We didn't process wxEVT_KEY_DOWN, so send wxEVT_CHAR

-            if (win->GetEventHandler()->ProcessEvent( keyEvent ))
+            if (win->HandleWindowEvent( keyEvent ))

                 return true;
 
             keyEvent.SetEventType(wxEVT_CHAR);
             // Do the translation again, retaining the ASCII
             // code.
             if (wxTranslateKeyEvent(keyEvent, win, window, event, true) &&
                 return true;
 
             keyEvent.SetEventType(wxEVT_CHAR);
             // Do the translation again, retaining the ASCII
             // code.
             if (wxTranslateKeyEvent(keyEvent, win, window, event, true) &&

-                win->GetEventHandler()->ProcessEvent( keyEvent ))
+                win->HandleWindowEvent( keyEvent ))

                 return true;
 
             if ( (keyEvent.m_keyCode == WXK_TAB) &&
                 return true;
 
             if ( (keyEvent.m_keyCode == WXK_TAB) &&


@@ -412,7 +409,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
                 /* CTRL-TAB changes the (parent) window, i.e. switch notebook page */
                 new_event.SetWindowChange( keyEvent.ControlDown() );
                 new_event.SetCurrentFocus( win );
                 /* CTRL-TAB changes the (parent) window, i.e. switch notebook page */
                 new_event.SetWindowChange( keyEvent.ControlDown() );
                 new_event.SetCurrentFocus( win );

-                return win->GetParent()->GetEventHandler()->ProcessEvent( new_event );
+                return win->GetParent()->HandleWindowEvent( new_event );

             }
 
             return false;
             }
 
             return false;


@@ -425,7 +422,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
             wxKeyEvent keyEvent(wxEVT_KEY_UP);
             wxTranslateKeyEvent(keyEvent, win, window, event);
 
             wxKeyEvent keyEvent(wxEVT_KEY_UP);
             wxTranslateKeyEvent(keyEvent, win, window, event);
 

-            return win->GetEventHandler()->ProcessEvent( keyEvent );
+            return win->HandleWindowEvent( keyEvent );

         }
         case ConfigureNotify:
         {
         }
         case ConfigureNotify:
         {


@@ -449,7 +446,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
                     wxSizeEvent sizeEvent( wxSize(XConfigureEventGetWidth(event), XConfigureEventGetHeight(event)), win->GetId() );
                     sizeEvent.SetEventObject( win );
 
                     wxSizeEvent sizeEvent( wxSize(XConfigureEventGetWidth(event), XConfigureEventGetHeight(event)), win->GetId() );
                     sizeEvent.SetEventObject( win );
 

-                    return win->GetEventHandler()->ProcessEvent( sizeEvent );
+                    return win->HandleWindowEvent( sizeEvent );

                 }
             }
             return false;
                 }
             }
             return false;


@@ -509,7 +506,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
             wxSizeEvent sizeEvent(sz, win->GetId());
             sizeEvent.SetEventObject(win);
 
             wxSizeEvent sizeEvent(sz, win->GetId());
             sizeEvent.SetEventObject(win);
 

-            return win->GetEventHandler()->ProcessEvent( sizeEvent );
+            return win->HandleWindowEvent( sizeEvent );

         }
 #endif
 #endif
         }
 #endif
 #endif


@@ -544,7 +541,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
 
             if (event->type == ButtonPress)
             {
 
             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.
                 {
                     // This might actually be done in wxWindow::SetFocus()
                     // and not here. TODO.


@@ -574,7 +571,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
 #endif
             wxMouseEvent wxevent;
             wxTranslateMouseEvent(wxevent, win, window, event);
 #endif
             wxMouseEvent wxevent;
             wxTranslateMouseEvent(wxevent, win, window, event);

-            return win->GetEventHandler()->ProcessEvent( wxevent );
+            return win->HandleWindowEvent( wxevent );

         }
         case FocusIn:
 #if !wxUSE_NANOX
         }
         case FocusIn:
 #if !wxUSE_NANOX


@@ -600,7 +597,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
                     focusEvent.SetWindow( g_prevFocus );
                     g_prevFocus = NULL;
 
                     focusEvent.SetWindow( g_prevFocus );
                     g_prevFocus = NULL;
 

-                    return win->GetEventHandler()->ProcessEvent(focusEvent);
+                    return win->HandleWindowEvent(focusEvent);

                 }
             }
             return false;
                 }
             }
             return false;


@@ -617,7 +614,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
                 focusEvent.SetEventObject(win);
                 focusEvent.SetWindow( g_nextFocus );
                 g_nextFocus = NULL;
                 focusEvent.SetEventObject(win);
                 focusEvent.SetWindow( g_nextFocus );
                 g_nextFocus = NULL;

-                return win->GetEventHandler()->ProcessEvent(focusEvent);
+                return win->HandleWindowEvent(focusEvent);

             }
             return false;
 
             }
             return false;
 


@@ -634,7 +631,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
 
 // This should be redefined in a derived class for
 // handling property change events for XAtom IPC.
 
 // 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
 {
     // by default do nothing special
     // TODO: what to do for X11


@@ -796,14 +793,7 @@ bool wxApp::Yield(bool onlyIfNeeded)
 
         // Make sure we have an event loop object,
         // or Pending/Dispatch will fail
 
         // Make sure we have an event loop object,
         // or Pending/Dispatch will fail

-        wxEventLoop* eventLoop = wxEventLoop::GetActive();
-        wxEventLoop* newEventLoop = NULL;
-        if (!eventLoop)
-        {
-            newEventLoop = new wxEventLoop;
-            wxEventLoop::SetActive(newEventLoop);
-        }
-
+       wxEventLoopGuarantor dummyLoopIfNeeded;

         // Call dispatch at least once so that sockets
         // can be tested
         wxTheApp->Dispatch();
         // Call dispatch at least once so that sockets
         // can be tested
         wxTheApp->Dispatch();


@@ -812,16 +802,10 @@ bool wxApp::Yield(bool onlyIfNeeded)
             wxTheApp->Dispatch();
 
 #if wxUSE_TIMER
             wxTheApp->Dispatch();
 
 #if wxUSE_TIMER

-        wxTimer::NotifyTimers();
+        wxGenericTimerImpl::NotifyTimers();

 #endif
         ProcessIdle();
 
 #endif
         ProcessIdle();
 

-        if (newEventLoop)
-        {
-            wxEventLoop::SetActive(NULL);
-            delete newEventLoop;
-        }
-

         s_inYield = false;
     }
 
         s_inYield = false;
     }