Start of actual filling in of wxFrame. Makefile now supports tiff

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

diff --git a/src/motif/app.cpp b/src/motif/app.cpp
index 2e37fb6e74a4ea95394b55dcac547f5ab4bdc97e..53b01e0f35c5158c8ec43afb52b7d55a2b55856a 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"


@@ -40,11 +39,17 @@
     #include "wx/resource.h"
 #endif
 
     #include "wx/resource.h"
 #endif
 

+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif

 #include <Xm/Xm.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/Xresource.h>
 #include <X11/Xatom.h>
 #include <Xm/Xm.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/Xresource.h>
 #include <X11/Xatom.h>

+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif

 
 #include "wx/motif/private.h"
 
 
 #include "wx/motif/private.h"
 


@@ -53,22 +58,27 @@
 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;
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
 
 BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
     EVT_IDLE(wxApp::OnIdle)
 END_EVENT_TABLE()
 IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
 
 BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
     EVT_IDLE(wxApp::OnIdle)
 END_EVENT_TABLE()

-#endif
+
+#ifdef __WXDEBUG__
+    typedef int (*XErrorHandlerFunc)(Display *, XErrorEvent *);
+
+    XErrorHandlerFunc gs_pfnXErrorHandler = 0;
+
+    static int wxXErrorHandler(Display *dpy, XErrorEvent *xevent)
+    {
+        // just forward to the default handler for now
+        return gs_pfnXErrorHandler(dpy, xevent);
+    }
+#endif // __WXDEBUG__

 
 long wxApp::sm_lastMessageTime = 0;
 
 
 long wxApp::sm_lastMessageTime = 0;
 


@@ -81,7 +91,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
 


@@ -346,22 +355,43 @@ void wxApp::ProcessXEvent(WXEvent* _event)
                    widget, XtParent(widget));
 #endif // DEBUG
 
                    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)
     {
     }
     else if (event->type == PropertyNotify)
     {


@@ -469,6 +499,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()
 {


@@ -528,24 +565,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()
 {


@@ -568,6 +587,11 @@ bool wxApp::OnInitGui()
     }
     m_initialDisplay = (WXDisplay*) dpy;
 
     }
     m_initialDisplay = (WXDisplay*) dpy;
 

+#ifdef __WXDEBUG__
+    // install the X error handler
+    gs_pfnXErrorHandler = XSetErrorHandler(wxXErrorHandler);
+#endif // __WXDEBUG__
+

     wxTheApp->m_topLevelWidget = (WXWidget) XtAppCreateShell((String)NULL, (const char*) wxTheApp->GetClassName(),
         applicationShellWidgetClass,dpy,
         NULL,0) ;
     wxTheApp->m_topLevelWidget = (WXWidget) XtAppCreateShell((String)NULL, (const char*) wxTheApp->GetClassName(),
         applicationShellWidgetClass,dpy,
         NULL,0) ;


@@ -640,22 +664,46 @@ bool wxApp::CheckForKeyDown(WXEvent* event)
     XEvent* xEvent = (XEvent*) event;
     if (xEvent->xany.type == KeyPress)
     {
     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);
+       // 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_DOWN);
+       wxTranslateKeyEvent(keyEvent, win, (Widget) 0, xEvent);

 
 

-      win->ProcessEvent( keyEvent );
-      return (keyEvent.GetSkipped() != TRUE);
+       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);
+
+       if (!widget || !win)
+            return FALSE;
+
+       wxKeyEvent keyEvent(wxEVT_KEY_UP);
+       wxTranslateKeyEvent(keyEvent, win, (Widget) 0, xEvent);
+
+       return win->ProcessEvent( keyEvent );

     }
 
     return FALSE;
     }
 
     return FALSE;


@@ -718,3 +766,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();
+}