X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/31528cd3cac75558beef4bce0ba21fd182a808ab..e16ebee6a9cb46e71b5e15fe14edf61fd790bb14:/src/motif/app.cpp

diff --git a/src/motif/app.cpp b/src/motif/app.cpp
index 2e37fb6e74..7ef99770b1 100644
--- a/src/motif/app.cpp
+++ b/src/motif/app.cpp
@@ -11,7 +11,6 @@
 
 #ifdef __GNUG__
     #pragma implementation "app.h"
-    #pragma implementation "appbase.h"
 #endif
 
 #include "wx/frame.h"
@@ -53,11 +52,6 @@
 extern char *wxBuffer;
 extern wxList wxPendingDelete;
 
-#if wxUSE_THREADS
-extern wxList *wxPendingEvents;
-extern wxCriticalSection *wxPendingEventsLocker;
-#endif // wxUSE_THREADS
-
 wxApp *wxTheApp = NULL;
 
 wxHashTable *wxWidgetHashTable = NULL;
@@ -81,7 +75,6 @@ bool wxApp::Initialize()
     // GL: I'm annoyed ... I don't know where to put this and I don't want to
     // create a module for that as it's part of the core.
 #if wxUSE_THREADS
-    wxPendingEvents = new wxList();
     wxPendingEventsLocker = new wxCriticalSection();
 #endif
 
@@ -346,22 +339,43 @@ void wxApp::ProcessXEvent(WXEvent* _event)
                    widget, XtParent(widget));
 #endif // DEBUG
 
-      if (CheckForAccelerator(_event))
-      {
-        // Do nothing! We intercepted and processed the event as an
-        // accelerator.
-        return;
-      }
-      else if (CheckForKeyDown(_event))
-      {
-        // We intercepted and processed the key down event
-        return;
-      }
-      else
-      {
-        XtDispatchEvent(event);
-        return;
-      }
+	if (CheckForAccelerator(_event))
+	{
+            // Do nothing! We intercepted and processed the event as an
+            // accelerator.
+            return;
+	}
+#if 1
+        // It seemed before that this hack was redundant and 
+        // key down events were being generated by wxCanvasInputEvent.
+        // But no longer - why ???
+        //
+	else if (CheckForKeyDown(_event))
+	{
+            // We intercepted and processed the key down event
+            return;
+	}
+#endif        
+	else
+	{
+            XtDispatchEvent(event);
+	    return;
+	}
+    }
+    else if (event->type == KeyRelease)
+    {
+        // TODO: work out why we still need this !  -michael
+        //
+        if (CheckForKeyUp(_event))
+	{
+	    // We intercepted and processed the key up event
+	    return;
+	}
+	else
+	{
+	    XtDispatchEvent(event);
+	    return;
+	}
     }
     else if (event->type == PropertyNotify)
     {
@@ -528,24 +542,6 @@ void wxApp::DeletePendingObjects()
     }
 }
 
-#if wxUSE_THREADS
-void wxApp::ProcessPendingEvents()
-{
-    wxNode *node = wxPendingEvents->First();
-    wxCriticalSectionLocker locker(*wxPendingEventsLocker);
-
-    while (node)
-    {
-        wxEvtHandler *handler = (wxEvtHandler *)node->Data();
-
-        handler->ProcessPendingEvents();
-
-        delete node;
-        node = wxPendingEvents->First();
-    }
-}
-#endif // wxUSE_THREADS
-
 // Create an application context
 bool wxApp::OnInitGui()
 {
@@ -640,22 +636,46 @@ bool wxApp::CheckForKeyDown(WXEvent* event)
     XEvent* xEvent = (XEvent*) event;
     if (xEvent->xany.type == KeyPress)
     {
-      Widget widget = XtWindowToWidget((Display*) wxGetDisplay(),
-                                       xEvent->xany.window);
-      wxWindow* win = NULL;
+        Widget widget = XtWindowToWidget((Display*) wxGetDisplay(),
+					 xEvent->xany.window);
+	wxWindow* win = NULL;
+
+	// Find the first wxWindow that corresponds to this event window
+	while (widget && !(win = wxGetWindowFromTable(widget)))
+            widget = XtParent(widget);
+
+	if (!widget || !win)
+            return FALSE;
+
+	wxKeyEvent keyEvent(wxEVT_KEY_DOWN);
+	wxTranslateKeyEvent(keyEvent, win, (Widget) 0, xEvent);
+
+	return win->ProcessEvent( keyEvent );
+    }
+
+    return FALSE;
+}
+
+bool wxApp::CheckForKeyUp(WXEvent* event)
+{
+    XEvent* xEvent = (XEvent*) event;
+    if (xEvent->xany.type == KeyRelease)
+    {
+        Widget widget = XtWindowToWidget((Display*) wxGetDisplay(),
+					 xEvent->xany.window);
+	wxWindow* win = NULL;
 
-      // Find the first wxWindow that corresponds to this event window
-      while (widget && !(win = wxGetWindowFromTable(widget)))
-          widget = XtParent(widget);
+	// Find the first wxWindow that corresponds to this event window
+	while (widget && !(win = wxGetWindowFromTable(widget)))
+            widget = XtParent(widget);
 
-      if (!widget || !win)
-          return FALSE;
+	if (!widget || !win)
+            return FALSE;
 
-      wxKeyEvent keyEvent(wxEVT_KEY_DOWN);
-      wxTranslateKeyEvent(keyEvent, win, (Widget) 0, xEvent);
+	wxKeyEvent keyEvent(wxEVT_KEY_UP);
+	wxTranslateKeyEvent(keyEvent, win, (Widget) 0, xEvent);
 
-      win->ProcessEvent( keyEvent );
-      return (keyEvent.GetSkipped() != TRUE);
+	return win->ProcessEvent( keyEvent );
     }
 
     return FALSE;
@@ -718,3 +738,12 @@ wxApp::GetStdIcon(int which) const
             return wxIcon(error_xpm);
     }
 }
+
+// ----------------------------------------------------------------------------
+// accessors for C modules
+// ----------------------------------------------------------------------------
+
+extern "C" XtAppContext wxGetAppContext()
+{
+    return (XtAppContext)wxTheApp->GetAppContext();
+}