* 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:
@@ -93,8 +93,8 @@ extern char *wxOsVersion;
|
||||
extern wxList *wxWinHandleList;
|
||||
extern wxList WXDLLEXPORT wxPendingDelete;
|
||||
#if wxUSE_THREADS
|
||||
extern wxList wxPendingEvents;
|
||||
extern wxCriticalSection wxPendingEventsLocker;
|
||||
extern wxList *wxPendingEvents;
|
||||
extern wxCriticalSection *wxPendingEventsLocker;
|
||||
#endif
|
||||
extern void wxSetKeyboardHook(bool doIt);
|
||||
extern wxCursor *g_globalCursor;
|
||||
@@ -169,6 +169,12 @@ bool wxApp::Initialize()
|
||||
wxGetResource("wxWindows", "OsVersion", &wxOsVersion);
|
||||
#endif
|
||||
|
||||
// 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();
|
||||
|
||||
@@ -551,6 +557,13 @@ void wxApp::CleanUp()
|
||||
if (wxWinHandleList)
|
||||
delete wxWinHandleList ;
|
||||
|
||||
// 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
|
||||
|
||||
wxClassInfo::CleanUpClasses();
|
||||
|
||||
delete wxTheApp;
|
||||
@@ -922,8 +935,8 @@ bool wxApp::ProcessIdle()
|
||||
#if wxUSE_THREADS
|
||||
void wxApp::ProcessPendingEvents()
|
||||
{
|
||||
wxNode *node = wxPendingEvents.First();
|
||||
wxCriticalSectionLocker locker(wxPendingEventsLocker);
|
||||
wxNode *node = wxPendingEvents->First();
|
||||
wxCriticalSectionLocker locker(*wxPendingEventsLocker);
|
||||
|
||||
while (node)
|
||||
{
|
||||
@@ -932,7 +945,7 @@ void wxApp::ProcessPendingEvents()
|
||||
handler->ProcessPendingEvents();
|
||||
|
||||
delete node;
|
||||
node = wxPendingEvents.First();
|
||||
node = wxPendingEvents->First();
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user