#pragma implementation "app.h"
#endif
+#ifdef __VMS
+#define XtParent XTPARENT
+#define XtDisplay XTDISPLAY
+#endif
+
#include "wx/frame.h"
#include "wx/app.h"
#include "wx/utils.h"
#include <string.h>
-extern char *wxBuffer;
extern wxList wxPendingDelete;
wxApp *wxTheApp = NULL;
EVT_IDLE(wxApp::OnIdle)
END_EVENT_TABLE()
+#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;
bool wxApp::Initialize()
{
- wxBuffer = new char[BUFSIZ + 512];
-
wxClassInfo::InitializeClasses();
// GL: I'm annoyed ... I don't know where to put this and I don't want to
// 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;
wxBitmap::CleanUpHandlers();
- delete[] wxBuffer;
- wxBuffer = NULL;
-
wxClassInfo::CleanUpClasses();
delete wxTheApp;
wxApp::wxApp()
{
- m_topWindow = NULL;
- wxTheApp = this;
- m_className = "";
- m_wantDebugOutput = TRUE ;
- m_appName = "";
argc = 0;
argv = NULL;
- m_exitOnFrameDelete = TRUE;
m_mainColormap = (WXColormap) NULL;
m_appContext = (WXAppContext) 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 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))
- {
+ else if (CheckForKeyDown(_event))
+ {
// We intercepted and processed the key down event
return;
- }
+ }
#endif
- else
- {
+ 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();
}
}
+static char *fallbackResources[] = {
+ "*menuBar.marginHeight: 0",
+ "*menuBar.shadowThickness: 1",
+ "*background: #c0c0c0",
+ "*foreground: black",
+ NULL
+};
+
// Create an application context
bool wxApp::OnInitGui()
{
XtToolkitInitialize() ;
- wxTheApp->m_appContext = (WXAppContext) XtCreateApplicationContext() ;
+ wxTheApp->m_appContext = (WXAppContext) XtCreateApplicationContext();
+ XtAppSetFallbackResources((XtAppContext) wxTheApp->m_appContext, fallbackResources);
+
Display *dpy = XtOpenDisplay((XtAppContext) wxTheApp->m_appContext,(String)NULL,NULL,
(const char*) wxTheApp->GetClassName(), NULL, 0,
# if XtSpecificationRelease < 5
argv);
if (!dpy) {
+ // if you don't log to stderr, nothing will be shown...
+ delete wxLog::SetActiveTarget(new wxLogStderr);
wxString className(wxTheApp->GetClassName());
wxLogError(_("wxWindows could not open display for '%s': exiting."),
(const char*) className);
}
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()
-{
- 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
-
- return TRUE;
-}
-
-// TODO use XmGetPixmap (?) to get the really standard icons!
-
-#include "wx/generic/info.xpm"
-#include "wx/generic/error.xpm"
-#include "wx/generic/question.xpm"
-#include "wx/generic/warning.xpm"
-
-wxIcon
-wxApp::GetStdIcon(int which) const
+bool wxApp::Yield(bool onlyIfNeeded)
{
- switch(which)
+ bool s_inYield = FALSE;
+
+ if ( s_inYield )
{
- case wxICON_INFORMATION:
- return wxIcon(info_xpm);
+ if ( !onlyIfNeeded )
+ {
+ wxFAIL_MSG( wxT("wxYield called recursively" ) );
+ }
+
+ return FALSE;
+ }
- case wxICON_QUESTION:
- return wxIcon(question_xpm);
+ s_inYield = TRUE;
- case wxICON_EXCLAMATION:
- return wxIcon(warning_xpm);
+ while (wxTheApp && wxTheApp->Pending())
+ wxTheApp->Dispatch();
- default:
- wxFAIL_MSG("requested non existent standard icon");
- // still fall through
+ s_inYield = FALSE;
- case wxICON_HAND:
- return wxIcon(error_xpm);
- }
+ return TRUE;
}
// ----------------------------------------------------------------------------
projects / wxWidgets.git / blobdiff