/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
-#pragma implementation "app.h"
+ #pragma implementation "app.h"
+#endif
+
+#ifdef __VMS
+#define XtParent XTPARENT
+#define XtDisplay XTDISPLAY
#endif
#include "wx/frame.h"
#include "wx/log.h"
#include "wx/module.h"
#include "wx/memory.h"
+#include "wx/log.h"
+#include "wx/intl.h"
+#include "wx/evtloop.h"
+#include "wx/hash.h"
#if wxUSE_THREADS
-#include "wx/thread.h"
+ #include "wx/thread.h"
#endif
-#if wxUSE_WX_RESOURCES
-#include "wx/resource.h"
+#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"
#include <string.h>
-extern char *wxBuffer;
extern wxList wxPendingDelete;
+extern bool wxAddIdleCallback();
wxApp *wxTheApp = NULL;
wxHashTable *wxWidgetHashTable = NULL;
-#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
+
BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
-EVT_IDLE(wxApp::OnIdle)
+ 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;
bool wxApp::Initialize()
{
-#ifdef __WXMSW__
- wxBuffer = new char[1500];
-#else
- wxBuffer = new char[BUFSIZ + 512];
-#endif
-
wxClassInfo::InitializeClasses();
+ // 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
+ wxPendingEventsLocker = new wxCriticalSection();
+#endif
+
wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
wxTheColourDatabase->Initialize();
wxInitializeStockLists();
wxInitializeStockObjects();
-#if wxUSE_WX_RESOURCES
- wxInitializeResourceSystem();
-#endif
-
- // For PostScript printing
-#if wxUSE_POSTSCRIPT
- /* Done using wxModule now
- wxInitializePrintSetupData();
- wxThePrintPaperDatabase = new wxPrintPaperDatabase;
- wxThePrintPaperDatabase->CreateDatabase();
- */
-#endif
-
- wxBitmap::InitStandardHandlers();
-
wxWidgetHashTable = new wxHashTable(wxKEY_INTEGER);
wxModule::RegisterModules();
wxModule::CleanUpModules();
-#if wxUSE_WX_RESOURCES
- wxCleanUpResourceSystem();
-#endif
-
wxDeleteStockObjects() ;
// 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 wxUSE_POSTSCRIPT
- /* Done using wxModule now
- wxInitializePrintSetupData(FALSE);
- delete wxThePrintPaperDatabase;
- wxThePrintPaperDatabase = NULL;
- */
-#endif
-
- wxBitmap::CleanUpHandlers();
-
- delete[] wxBuffer;
- wxBuffer = NULL;
-
wxClassInfo::CleanUpClasses();
delete wxTheApp;
wxTheApp = NULL;
+ // 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
+ delete wxPendingEvents;
+ delete wxPendingEventsLocker;
+#endif
+
#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
// At this point we want to check if there are any memory
// blocks that aren't part of the wxDebugContext itself,
// GUI-specific initialization, such as creating an app context.
wxTheApp->OnInitGui();
- // Here frames insert themselves automatically
- // into wxTopLevelWindows by getting created
- // in OnInit().
+ // Here frames insert themselves automatically into wxTopLevelWindows by
+ // getting created in OnInit().
int retValue = 0;
if (wxTheApp->OnInit())
if ( pLog != NULL && pLog->HasPendingMessages() )
pLog->Flush();
- delete wxLog::SetActiveTarget(new wxLogStderr); // So dialog boxes aren't used
- // for further messages
+ // So dialog boxes aren't used for further messages
+ delete wxLog::SetActiveTarget(new wxLogStderr);
if (wxTheApp->GetTopWindow())
{
};
// Static member initialization
-wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL;
+wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;
wxApp::wxApp()
{
- m_topWindow = NULL;
- wxTheApp = this;
- m_className = "";
- m_wantDebugOutput = TRUE ;
- m_appName = "";
argc = 0;
argv = NULL;
- m_printMode = wxPRINT_POSTSCRIPT;
- m_exitOnFrameDelete = TRUE;
- m_auto3D = TRUE;
+ m_eventLoop = new wxEventLoop;
m_mainColormap = (WXColormap) NULL;
m_appContext = (WXAppContext) NULL;
m_topLevelWidget = (WXWidget) NULL;
m_initialDisplay = (WXDisplay*) 0;
}
+wxApp::~wxApp()
+{
+ delete m_eventLoop;
+}
+
bool wxApp::Initialized()
{
if (GetTopWindow())
int wxApp::MainLoop()
{
- m_keepGoing = TRUE;
-
/*
* Sit around forever waiting to process X-events. Property Change
* event are handled special, because they have to refer to
XDefaultRootWindow(XtDisplay((Widget) wxTheApp->GetTopLevelWidget())),
PropertyChangeMask);
- XEvent event;
-
- // Use this flag to allow breaking the loop via wxApp::ExitMainLoop()
- while (m_keepGoing)
- {
- XtAppNextEvent( (XtAppContext) wxTheApp->GetAppContext(), &event);
-
- ProcessXEvent((WXEvent*) & event);
-
- if (XtAppPending( (XtAppContext) wxTheApp->GetAppContext() ) == 0)
- {
- if (!ProcessIdle())
- {
- // leave the main loop to give other threads a chance to
- // perform their GUI work
- wxMutexGuiLeave();
- wxUsleep(20);
- wxMutexGuiEnter();
- }
- }
-
- }
+ m_eventLoop->Run();
return 0;
}
-// Processes an X event.
-void wxApp::ProcessXEvent(WXEvent* _event)
-{
- XEvent* event = (XEvent*) _event;
-
- if ((event->type == KeyPress) && CheckForAccelerator(_event))
- {
- // Do nothing! We intercepted and processed the event as an accelerator.
- return;
- }
- else if (event->type == PropertyNotify)
- {
- HandlePropertyChange(_event);
- return;
- }
- else if (event->type == ResizeRequest)
- {
- /* Terry Gitnick <terryg@scientech.com> - 1/21/98
- * If resize event, don't resize until the last resize event for this
- * window is recieved. Prevents flicker as windows are resized.
- */
-
- Display *disp = XtDisplay((Widget) wxTheApp->GetTopLevelWidget());
- Window win = event->xany.window;
- XEvent report;
-
- // to avoid flicker
- report = * event;
- while( XCheckTypedWindowEvent (disp, win, ResizeRequest, &report));
-
- // TODO: when implementing refresh optimization, we can use
- // XtAddExposureToRegion to expand the window's paint region.
-
- XtDispatchEvent(event);
- }
- else
- {
- XtDispatchEvent(event);
- }
-}
-
+// Processes an idle event.
// Returns TRUE if more time is needed.
bool wxApp::ProcessIdle()
{
wxIdleEvent event;
- event.SetEventObject(this);
- ProcessEvent(event);
- return event.MoreRequested();
+ return ProcessEvent(event) && event.MoreRequested();
}
void wxApp::ExitMainLoop()
{
- m_keepGoing = FALSE;
+ m_eventLoop->Exit();
}
// Is a message/event pending?
bool wxApp::Pending()
{
+ return m_eventLoop->Pending();
+#if 0
XFlush(XtDisplay( (Widget) wxTheApp->GetTopLevelWidget() ));
// Fix by Doug from STI, to prevent a stall if non-X event
// is found.
return ((XtAppPending( (XtAppContext) GetAppContext() ) & XtIMXEvent) != 0) ;
+#endif
}
// Dispatch a message.
void wxApp::Dispatch()
{
- // XtAppProcessEvent( (XtAppContext) wxTheApp->GetAppContext(), XtIMAll);
-
- XEvent event;
- XtAppNextEvent((XtAppContext) GetAppContext(), &event);
- ProcessXEvent((WXEvent*) & event);
+ m_eventLoop->Dispatch();
}
// This should be redefined in a derived class for
inOnIdle = TRUE;
+ // 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
+
+ // Flush pending events.
+ ProcessPendingEvents();
+
// 'Garbage' collection of windows deleted with Close().
DeletePendingObjects();
bool wxApp::SendIdleEvents()
{
bool needMore = FALSE;
- wxNode* node = wxTopLevelWindows.First();
+
+ wxWindowList::Node* node = wxTopLevelWindows.GetFirst();
while (node)
{
- wxWindow* win = (wxWindow*) node->Data();
+ wxWindow* win = node->GetData();
if (SendIdleEvents(win))
needMore = TRUE;
-
- node = node->Next();
+ node = node->GetNext();
}
+
return needMore;
}
if (event.MoreRequested())
needMore = TRUE;
- wxNode* node = win->GetChildren().First();
+ wxWindowList::Node* node = win->GetChildren().GetFirst();
while (node)
{
- wxWindow* win = (wxWindow*) node->Data();
+ wxWindow* win = node->GetData();
if (SendIdleEvents(win))
needMore = TRUE;
- node = node->Next();
+ node = node->GetNext();
}
return needMore ;
}
void wxApp::DeletePendingObjects()
{
- wxNode *node = wxPendingDelete.First();
+ wxList::Node *node = wxPendingDelete.GetFirst();
while (node)
{
- wxObject *obj = (wxObject *)node->Data();
+ wxObject *obj = node->GetData();
delete obj;
// Deleting one object may have deleted other pending
// objects, so start from beginning of list again.
- node = wxPendingDelete.First();
+ node = wxPendingDelete.GetFirst();
}
}
-wxLog* wxApp::CreateLogTarget()
-{
- return new wxLogGui;
-}
-
-wxWindow* wxApp::GetTopWindow() const
-{
- if (m_topWindow)
- return m_topWindow;
- else if (wxTopLevelWindows.Number() > 0)
- return (wxWindow*) wxTopLevelWindows.First()->Data();
- else
- return NULL;
-}
+static char *fallbackResources[] = {
+ "*menuBar.marginHeight: 0",
+ "*menuBar.shadowThickness: 1",
+ "*background: #c0c0c0",
+ "*foreground: black",
+ NULL
+};
// Create an application context
bool wxApp::OnInitGui()
{
+ if( !wxAppBase::OnInitGui() )
+ return FALSE;
+
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,
+ wxTheApp->GetClassName().c_str(), NULL, 0,
# if XtSpecificationRelease < 5
- 0,(Cardinal*) &argc,argv) ;
+ (Cardinal*) &argc,
# else
- 0,&argc,argv) ;
+ &argc,
# endif
+ argv);
+
if (!dpy) {
- cerr << "wxWindows could not open display for " << wxTheApp->GetClassName() << ": exiting.\n";
+ // 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."),
+ className.c_str());
exit(-1);
}
m_initialDisplay = (WXDisplay*) dpy;
- wxTheApp->m_topLevelWidget = (WXWidget) XtAppCreateShell((String)NULL, (const char*) wxTheApp->GetClassName(),
- applicationShellWidgetClass,dpy,
- NULL,0) ;
+#ifdef __WXDEBUG__
+ // install the X error handler
+ gs_pfnXErrorHandler = XSetErrorHandler(wxXErrorHandler);
+#endif // __WXDEBUG__
+
+ wxTheApp->m_topLevelWidget =
+ (WXWidget) XtAppCreateShell((String)NULL,
+ wxTheApp->GetClassName().c_str(),
+ applicationShellWidgetClass,dpy,
+ NULL,0) ;
// Add general resize proc
XtActionsRec rec;
GetMainColormap(dpy);
m_maxRequestSize = XMaxRequestSize((Display*) dpy);
+ wxAddIdleCallback();
+
return TRUE;
}
return (WXColormap) c;
}
-// Returns TRUE if an accelerator has been processed
-bool wxApp::CheckForAccelerator(WXEvent* event)
-{
- XEvent* xEvent = (XEvent*) event;
- if (xEvent->xany.type == KeyPress)
- {
- // Find a wxWindow for this window
- // TODO: should get display for the window, not the current display
- 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_CHAR);
- wxTranslateKeyEvent(keyEvent, win, (Widget) 0, xEvent);
-
- // Now we have a wxKeyEvent and we have a wxWindow.
- // Go up the hierarchy until we find a matching accelerator,
- // or we get to the top.
- while (win)
- {
- if (win->ProcessAccelerator(keyEvent))
- return TRUE;
- win = win->GetParent();
- }
- return FALSE;
- }
- return FALSE;
-}
-
void wxExit()
{
int retValue = 0;
wxApp::CleanUp();
/*
- * Exit in some platform-specific way. Not recommended that the app calls this:
+ * Exit in some platform-specific way.
+ * Not recommended that the app calls this:
* only for emergencies.
*/
exit(retValue);
}
// 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;
}
+// ----------------------------------------------------------------------------
+// accessors for C modules
+// ----------------------------------------------------------------------------
+
+extern "C" XtAppContext wxGetAppContext()
+{
+ return (XtAppContext)wxTheApp->GetAppContext();
+}
projects / wxWidgets.git / blobdiff