// Created: 17/09/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
#include "wx/log.h"
#include "wx/module.h"
#include "wx/memory.h"
-#include "wx/thread.h"
+#include "wx/log.h"
+#include "wx/intl.h"
+
+#if wxUSE_THREADS
+ #include "wx/thread.h"
+#endif
#if wxUSE_WX_RESOURCES
-#include "wx/resource.h"
+ #include "wx/resource.h"
#endif
#include <Xm/Xm.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()
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
+ wxPendingEvents = new wxList();
+ wxPendingEventsLocker = new wxCriticalSection();
+#endif
+
wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
wxTheColourDatabase->Initialize();
wxInitializeResourceSystem();
#endif
- // For PostScript printing
+ // For PostScript printing
#if wxUSE_POSTSCRIPT
-/* Done using wxModule now
+ /* Done using wxModule now
wxInitializePrintSetupData();
wxThePrintPaperDatabase = new wxPrintPaperDatabase;
wxThePrintPaperDatabase->CreateDatabase();
-*/
+ */
#endif
wxBitmap::InitStandardHandlers();
wxTheColourDatabase = NULL;
#if wxUSE_POSTSCRIPT
-/* Done using wxModule now
+ /* Done using wxModule now
wxInitializePrintSetupData(FALSE);
delete wxThePrintPaperDatabase;
wxThePrintPaperDatabase = NULL;
-*/
+ */
#endif
wxBitmap::CleanUpHandlers();
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,
// wxDebugContext, too.
if (wxDebugContext::CountObjectsLeft(TRUE) > 0)
{
- wxLogDebug("There were memory leaks.\n");
- wxDebugContext::Dump();
- wxDebugContext::PrintStatistics();
+ wxLogDebug("There were memory leaks.\n");
+ wxDebugContext::Dump();
+ wxDebugContext::PrintStatistics();
}
#endif
-
+
// do it as the very last thing because everything else can log messages
wxLog::DontCreateOnDemand();
// do it as the very last thing because everything else can log messages
#endif
if (!wxApp::Initialize())
- return FALSE;
+ return FALSE;
if (!wxTheApp)
{
- if (!wxApp::GetInitializerFunction())
- {
- printf( "wxWindows error: No initializer - use IMPLEMENT_APP macro.\n" );
- return 0;
- };
-
- wxTheApp = (wxApp*) (* wxApp::GetInitializerFunction()) ();
+ if (!wxApp::GetInitializerFunction())
+ {
+ printf( "wxWindows error: No initializer - use IMPLEMENT_APP macro.\n" );
+ return 0;
+ };
+
+ wxTheApp = (wxApp*) (* wxApp::GetInitializerFunction()) ();
};
-
+
if (!wxTheApp)
{
- printf( "wxWindows error: wxTheApp == NULL\n" );
- return 0;
+ printf( "wxWindows error: wxTheApp == NULL\n" );
+ return 0;
};
wxTheApp->SetClassName(wxFileNameFromPath(argv[0]));
// 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 (wxTheApp->Initialized()) retValue = wxTheApp->OnRun();
+ if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun();
}
// flush the logged messages if any
wxLog *pLog = wxLog::GetActiveTarget();
if ( pLog != NULL && pLog->HasPendingMessages() )
- pLog->Flush();
+ pLog->Flush();
delete wxLog::SetActiveTarget(new wxLogStderr); // So dialog boxes aren't used
- // for further messages
+ // for further messages
if (wxTheApp->GetTopWindow())
{
- delete wxTheApp->GetTopWindow();
- wxTheApp->SetTopWindow(NULL);
+ delete wxTheApp->GetTopWindow();
+ wxTheApp->SetTopWindow(NULL);
}
-
+
wxTheApp->DeletePendingObjects();
-
+
wxTheApp->OnExit();
-
+
wxApp::CleanUp();
return retValue;
bool wxApp::Initialized()
{
if (GetTopWindow())
- return TRUE;
+ return TRUE;
else
- return FALSE;
+ return FALSE;
}
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
* the root window rather than to a widget. therefore we can't
*/
XSelectInput(XtDisplay((Widget) wxTheApp->GetTopLevelWidget()),
- XDefaultRootWindow(XtDisplay((Widget) wxTheApp->GetTopLevelWidget())),
- PropertyChangeMask);
+ 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())
- {
- wxMutexGuiLeave();
- usleep(20);
- wxMutexGuiEnter();
- }
- }
-
+ XtAppNextEvent( (XtAppContext) wxTheApp->GetAppContext(), &event);
+
+ ProcessXEvent((WXEvent*) & event);
+
+ if (XtAppPending( (XtAppContext) wxTheApp->GetAppContext() ) == 0)
+ {
+ if (!ProcessIdle())
+ {
+#if wxUSE_THREADS
+ // leave the main loop to give other threads a chance to
+ // perform their GUI work
+ wxMutexGuiLeave();
+ wxUsleep(20);
+ wxMutexGuiEnter();
+#endif
+ }
+ }
+
}
return 0;
}
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.
- */
+ /* 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));
// Dispatch a message.
void wxApp::Dispatch()
{
-// XtAppProcessEvent( (XtAppContext) wxTheApp->GetAppContext(), XtIMAll);
+ // XtAppProcessEvent( (XtAppContext) wxTheApp->GetAppContext(), XtIMAll);
XEvent event;
XtAppNextEvent((XtAppContext) GetAppContext(), &event);
// Avoid recursion (via ProcessEvent default case)
if (inOnIdle)
- return;
+ return;
inOnIdle = TRUE;
// 'Garbage' collection of windows deleted with Close().
DeletePendingObjects();
+#if wxUSE_THREADS
+ // Flush pending events.
+ ProcessPendingEvents();
+#endif
+
// flush the logged messages if any
wxLog *pLog = wxLog::GetActiveTarget();
if ( pLog != NULL && pLog->HasPendingMessages() )
- pLog->Flush();
+ pLog->Flush();
// Send OnIdle events to all windows
bool needMore = SendIdleEvents();
if (needMore)
- event.RequestMore(TRUE);
+ event.RequestMore(TRUE);
inOnIdle = FALSE;
}
bool wxApp::SendIdleEvents()
{
bool needMore = FALSE;
- wxNode* node = wxTopLevelWindows.First();
- while (node)
- {
- wxWindow* win = (wxWindow*) node->Data();
- if (SendIdleEvents(win))
+
+ wxWindowList::Node* node = wxTopLevelWindows.GetFirst();
+ while (node)
+ {
+ wxWindow* win = node->GetData();
+ if (SendIdleEvents(win))
needMore = TRUE;
+ node = node->GetNext();
+ }
- node = node->Next();
- }
return needMore;
}
{
bool needMore = FALSE;
- wxIdleEvent event;
- event.SetEventObject(win);
- win->ProcessEvent(event);
+ wxIdleEvent event;
+ event.SetEventObject(win);
+ win->ProcessEvent(event);
if (event.MoreRequested())
needMore = TRUE;
- wxNode* node = win->GetChildren().First();
- while (node)
- {
- wxWindow* win = (wxWindow*) node->Data();
- if (SendIdleEvents(win))
+ wxNode* node = win->GetChildren().First();
+ while (node)
+ {
+ wxWindow* win = (wxWindow*) node->Data();
+ if (SendIdleEvents(win))
needMore = TRUE;
- node = node->Next();
- }
+ node = node->Next();
+ }
return needMore ;
}
wxNode *node = wxPendingDelete.First();
while (node)
{
- wxObject *obj = (wxObject *)node->Data();
-
- delete obj;
+ wxObject *obj = (wxObject *)node->Data();
- if (wxPendingDelete.Member(obj))
- delete node;
+ delete obj;
- // Deleting one object may have deleted other pending
- // objects, so start from beginning of list again.
- node = wxPendingDelete.First();
+ if (wxPendingDelete.Member(obj))
+ delete node;
+
+ // Deleting one object may have deleted other pending
+ // objects, so start from beginning of list again.
+ node = wxPendingDelete.First();
}
}
+#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
+
wxLog* wxApp::CreateLogTarget()
{
return new wxLogGui;
{
if (m_topWindow)
return m_topWindow;
- else if (wxTopLevelWindows.Number() > 0)
- return (wxWindow*) wxTopLevelWindows.First()->Data();
+ else if (wxTopLevelWindows.GetCount() > 0)
+ return wxTopLevelWindows.GetFirst()->GetData();
else
return NULL;
}
XtToolkitInitialize() ;
wxTheApp->m_appContext = (WXAppContext) XtCreateApplicationContext() ;
Display *dpy = XtOpenDisplay((XtAppContext) wxTheApp->m_appContext,(String)NULL,NULL,
- (const char*) wxTheApp->GetClassName(), NULL,
+ (const char*) wxTheApp->GetClassName(), 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";
- exit(-1);
+ wxString className(wxTheApp->GetClassName());
+ wxLogError(_("wxWindows could not open display for '%s': exiting."),
+ (const char*) className);
+ exit(-1);
}
m_initialDisplay = (WXDisplay*) dpy;
wxTheApp->m_topLevelWidget = (WXWidget) XtAppCreateShell((String)NULL, (const char*) wxTheApp->GetClassName(),
- applicationShellWidgetClass,dpy,
- NULL,0) ;
+ applicationShellWidgetClass,dpy,
+ NULL,0) ;
// Add general resize proc
XtActionsRec rec;
WXColormap wxApp::GetMainColormap(WXDisplay* display)
{
if (!display) /* Must be called first with non-NULL display */
- return m_mainColormap;
+ return m_mainColormap;
- Colormap c =
- DefaultColormapOfScreen(XScreenOfDisplay((Display*) display,
- DefaultScreen((Display*) display)));
+ int defaultScreen = DefaultScreen((Display*) display);
+ Screen* screen = XScreenOfDisplay((Display*) display, defaultScreen);
+
+ Colormap c = DefaultColormapOfScreen(screen);
if (!m_mainColormap)
- m_mainColormap = (WXColormap) c;
+ m_mainColormap = (WXColormap) c;
return (WXColormap) c;
}
{
int retValue = 0;
if (wxTheApp)
- retValue = wxTheApp->OnExit();
+ retValue = wxTheApp->OnExit();
wxApp::CleanUp();
/*
- * Exit in some platform-specific way. Not recommended that the app calls this:
- * only for emergencies.
- */
+ * Exit in some platform-specific way. Not recommended that the app calls this:
+ * only for emergencies.
+ */
exit(retValue);
}
bool wxYield()
{
while (wxTheApp && wxTheApp->Pending())
- wxTheApp->Dispatch();
+ wxTheApp->Dispatch();
+
+ // VZ: is it the same as this (taken from old wxExecute)?
+#if 0
+ XtAppProcessEvent((XtAppContext) wxTheApp->GetAppContext(), XtIMAll);
+#endif
+
return TRUE;
}
projects / wxWidgets.git / blobdiff