#ifdef __GNUG__
#pragma implementation "app.h"
- #pragma implementation "appbase.h"
+#endif
+
+#ifdef __VMS
+#define XtParent XTPARENT
+#define XtDisplay XTDISPLAY
#endif
#include "wx/frame.h"
#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>
+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif
#include "wx/motif/private.h"
extern char *wxBuffer;
extern wxList wxPendingDelete;
-#if wxUSE_THREADS
-extern wxList *wxPendingEvents;
-extern wxCriticalSection *wxPendingEventsLocker;
-#endif // wxUSE_THREADS
-
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()
-#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;
// 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
// Destroy all GDI lists, etc.
- delete wxTheBrushList;
- wxTheBrushList = NULL;
-
- delete wxThePenList;
- wxThePenList = NULL;
-
- delete wxTheFontList;
- wxTheFontList = NULL;
-
- delete wxTheBitmapList;
- wxTheBitmapList = NULL;
+ wxDeleteStockLists();
delete wxTheColourDatabase;
wxTheColourDatabase = NULL;
if (event->type == KeyPress)
{
-#ifdef __WXDEBUG__
+#if 0 // def __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))
- {
+ if (CheckForAccelerator(_event))
+ {
// Do nothing! We intercepted and processed the event as an
// accelerator.
return;
- }
-#if 0 // this isn't necessary anymore ??? -michael
- else if (CheckForKeyDown(_event))
- {
+ }
+#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
- {
+ }
+#endif
+ else
+ {
XtDispatchEvent(event);
- return;
- }
+ 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;
- }
+ {
+ // We intercepted and processed the key up event
+ return;
+ }
+ else
+ {
+ XtDispatchEvent(event);
+ return;
+ }
}
else if (event->type == PropertyNotify)
{
inOnIdle = TRUE;
- // 'Garbage' collection of windows deleted with Close().
- DeletePendingObjects();
+ // If there are pending events, we must process them: pending events
+ // are either events to the threads other than main or events posted
+ // with wxPostEvent() functions
+ // GRG: I have moved this here so that all pending events are processed
+ // before starting to delete any objects. This behaves better (in
+ // particular, wrt wxPostEvent) and is coherent with wxGTK's current
+ // behaviour. Also removed the '#if wxUSE_THREADS' around it.
+ // Changed Mar/2000 before 2.1.14
-#if wxUSE_THREADS
// Flush pending events.
ProcessPendingEvents();
-#endif
+
+ // 'Garbage' collection of windows deleted with Close().
+ DeletePendingObjects();
// flush the logged messages if any
wxLog *pLog = wxLog::GetActiveTarget();
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()
{
}
}
-#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()
{
}
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) ;
if (xEvent->xany.type == KeyPress)
{
Widget widget = XtWindowToWidget((Display*) wxGetDisplay(),
- xEvent->xany.window);
- wxWindow* win = NULL;
+ xEvent->xany.window);
+ wxWindow* win = NULL;
- // Find the first wxWindow that corresponds to this event window
- while (widget && !(win = wxGetWindowFromTable(widget)))
+ // Find the first wxWindow that corresponds to this event window
+ while (widget && !(win = wxGetWindowFromTable(widget)))
widget = XtParent(widget);
- if (!widget || !win)
+ 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);
- return win->ProcessEvent( keyEvent );
+ return win->ProcessEvent( keyEvent );
}
return FALSE;
if (xEvent->xany.type == KeyRelease)
{
Widget widget = XtWindowToWidget((Display*) wxGetDisplay(),
- xEvent->xany.window);
- wxWindow* win = NULL;
+ 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_UP);
- wxTranslateKeyEvent(keyEvent, win, (Widget) 0, xEvent);
+ wxKeyEvent keyEvent(wxEVT_KEY_UP);
+ wxTranslateKeyEvent(keyEvent, win, (Widget) 0, xEvent);
- return win->ProcessEvent( keyEvent );
+ return win->ProcessEvent( keyEvent );
}
return FALSE;
}
// Yield to other processes
-bool wxYield()
+
+bool wxApp::Yield(bool onlyIfNeeded)
{
+ bool s_inYield = FALSE;
+
+ if ( s_inYield )
+ {
+ if ( !onlyIfNeeded )
+ {
+ wxFAIL_MSG( wxT("wxYield called recursively" ) );
+ }
+
+ return FALSE;
+ }
+
+ s_inYield = TRUE;
+
while (wxTheApp && wxTheApp->Pending())
wxTheApp->Dispatch();
- // VZ: is it the same as this (taken from old wxExecute)?
-#if 0
- XtAppProcessEvent((XtAppContext) wxTheApp->GetAppContext(), XtIMAll);
-#endif
+ s_inYield = FALSE;
return TRUE;
}
return wxIcon(error_xpm);
}
}
+
+// ----------------------------------------------------------------------------
+// accessors for C modules
+// ----------------------------------------------------------------------------
+
+extern "C" XtAppContext wxGetAppContext()
+{
+ return (XtAppContext)wxTheApp->GetAppContext();
+}
projects / wxWidgets.git / blobdiff