* Changed "wxPendingEvents" to pointers (tested on GTK)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2031 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -51,8 +51,8 @@ extern char *wxBuffer;
|
||||
extern wxList wxPendingDelete;
|
||||
|
||||
#if wxUSE_THREADS
|
||||
extern wxList wxPendingEvents;
|
||||
extern wxCriticalSection wxPendingEventsLocker;
|
||||
extern wxList *wxPendingEvents;
|
||||
extern wxCriticalSection *wxPendingEventsLocker;
|
||||
#endif // wxUSE_THREADS
|
||||
|
||||
wxApp *wxTheApp = NULL;
|
||||
@@ -75,6 +75,13 @@ bool wxApp::Initialize()
|
||||
|
||||
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();
|
||||
|
||||
@@ -152,6 +159,13 @@ void wxApp::CleanUp()
|
||||
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,
|
||||
@@ -496,8 +510,8 @@ void wxApp::DeletePendingObjects()
|
||||
#if wxUSE_THREADS
|
||||
void wxApp::ProcessPendingEvents()
|
||||
{
|
||||
wxNode *node = wxPendingEvents.First();
|
||||
wxCriticalSectionLocker locker(wxPendingEventsLocker);
|
||||
wxNode *node = wxPendingEvents->First();
|
||||
wxCriticalSectionLocker locker(*wxPendingEventsLocker);
|
||||
|
||||
while (node)
|
||||
{
|
||||
@@ -506,7 +520,7 @@ void wxApp::ProcessPendingEvents()
|
||||
handler->ProcessPendingEvents();
|
||||
|
||||
delete node;
|
||||
node = wxPendingEvents.First();
|
||||
node = wxPendingEvents->First();
|
||||
}
|
||||
}
|
||||
#endif // wxUSE_THREADS
|
||||
|
Reference in New Issue
Block a user