VTK wrapper of vtkRenderWindow for wxPython. Tested on MSW so far.

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

diff --git a/src/motif/app.cpp b/src/motif/app.cpp
index 5ef52fda83b55722a2873b2d2a6ec5f36339a665..861f07e4dd1c689c249fe56fa43f7aaeb7ebfc72 100644 (file)
--- a/src/motif/app.cpp
+++ b/src/motif/app.cpp
@@ -11,7 +11,6 @@
 
 #ifdef __GNUG__
     #pragma implementation "app.h"
 
 #ifdef __GNUG__
     #pragma implementation "app.h"

-    #pragma implementation "appbase.h"

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


@@ -53,11 +52,6 @@
 extern char *wxBuffer;
 extern wxList wxPendingDelete;
 
 extern char *wxBuffer;
 extern wxList wxPendingDelete;
 

-#if wxUSE_THREADS
-extern wxList *wxPendingEvents;
-extern wxCriticalSection *wxPendingEventsLocker;
-#endif // wxUSE_THREADS
-

 wxApp *wxTheApp = NULL;
 
 wxHashTable *wxWidgetHashTable = NULL;
 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
     // 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
 
     wxPendingEventsLocker = new wxCriticalSection();
 #endif
 


@@ -340,22 +333,49 @@ void wxApp::ProcessXEvent(WXEvent* _event)
 
     if (event->type == KeyPress)
     {
 
     if (event->type == KeyPress)
     {

-      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;
-      }
+#ifdef __WXDEBUG__
+        Widget widget = XtWindowToWidget(event->xany.display, event->xany.window);
+        wxLogDebug("Got key press event for 0x%08x (parent = 0x%08x)",
+                   widget, XtParent(widget));
+#endif // DEBUG
+
+       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)
     {
     }
     else if (event->type == PropertyNotify)
     {


@@ -463,6 +483,13 @@ void wxApp::OnIdle(wxIdleEvent& event)
     inOnIdle = FALSE;
 }
 
     inOnIdle = FALSE;
 }
 

+void wxWakeUpIdle()
+{
+    // **** please implement me! ****
+    // Wake up the idle handler processor, even if it is in another thread...
+}
+
+

 // Send idle event to all top-level windows
 bool wxApp::SendIdleEvents()
 {
 // Send idle event to all top-level windows
 bool wxApp::SendIdleEvents()
 {


@@ -522,24 +549,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()
 {
 // Create an application context
 bool wxApp::OnInitGui()
 {


@@ -632,30 +641,49 @@ bool wxApp::CheckForAccelerator(WXEvent* event)
 bool wxApp::CheckForKeyDown(WXEvent* event)
 {
     XEvent* xEvent = (XEvent*) event;
 bool wxApp::CheckForKeyDown(WXEvent* event)
 {
     XEvent* xEvent = (XEvent*) event;

-    // VZ: this code doesn't work for me because it never finds the correct
-    //     window. Also, if we go this way, we should generate KEY_UP and
-    //     CHAR events as well, not only KEY_DOWN.
-#if 0

     if (xEvent->xany.type == KeyPress)
     {
     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 );

     }
     }

-#endif // 0

 
     return FALSE;
 }
 
     return FALSE;
 }


@@ -717,3 +745,12 @@ wxApp::GetStdIcon(int which) const
             return wxIcon(error_xpm);
     }
 }
             return wxIcon(error_xpm);
     }
 }

+
+// ----------------------------------------------------------------------------
+// accessors for C modules
+// ----------------------------------------------------------------------------
+
+extern "C" XtAppContext wxGetAppContext()
+{
+    return (XtAppContext)wxTheApp->GetAppContext();
+}