* Changed "wxPendingEvents" to pointers (tested on GTK)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2031 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/event.cpp b/src/common/event.cpp
index a1123fdf193887694192ec1095146411dc8ccc0e..07c9462cfffaf6f434fb5afc447a037a77f04a1c 100644 (file)
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -80,8 +80,8 @@
 
 #if wxUSE_THREADS
 /* To put pending event handlers */
 
 #if wxUSE_THREADS
 /* To put pending event handlers */

-extern wxList wxPendingEvents;
-extern wxCriticalSection wxPendingEventsLocker;
+extern wxList *wxPendingEvents;
+extern wxCriticalSection *wxPendingEventsLocker;

 #endif
 
 /*
 #endif
 
 /*


@@ -342,9 +342,9 @@ bool wxEvtHandler::ProcessThreadEvent(wxEvent& event)
 
     m_pendingEvents->Append(event_main);
 
 
     m_pendingEvents->Append(event_main);
 

-    wxPendingEventsLocker.Enter();
-    wxPendingEvents.Append(this);
-    wxPendingEventsLocker.Leave();
+    wxPendingEventsLocker->Enter();
+    wxPendingEvents->Append(this);
+    wxPendingEventsLocker->Leave();

 
     return TRUE;
 }
 
     return TRUE;
 }

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 67a48aab5c001966d47b0c9ad67827d3204298c9..e37f422742a07d78efc95078dbbe0e75b3853f02 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -47,8 +47,8 @@ wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL;
 
 extern wxList wxPendingDelete;
 #if wxUSE_THREADS
 
 extern wxList wxPendingDelete;
 #if wxUSE_THREADS

-extern wxList wxPendingEvents;
-extern wxCriticalSection wxPendingEventsLocker;
+extern wxList *wxPendingEvents;
+extern wxCriticalSection *wxPendingEventsLocker;

 #endif
 extern wxResourceCache *wxTheResourceCache;
 
 #endif
 extern wxResourceCache *wxTheResourceCache;
 


@@ -380,8 +380,8 @@ void wxApp::Dispatch()
 #if wxUSE_THREADS
 void wxApp::ProcessPendingEvents()
 {
 #if wxUSE_THREADS
 void wxApp::ProcessPendingEvents()
 {

-    wxNode *node = wxPendingEvents.First();
-    wxCriticalSectionLocker locker(wxPendingEventsLocker);
+    wxNode *node = wxPendingEvents->First();
+    wxCriticalSectionLocker locker(*wxPendingEventsLocker);

 
     while (node)
     {
 
     while (node)
     {


@@ -391,7 +391,7 @@ void wxApp::ProcessPendingEvents()
 
         delete node;
 
 
         delete node;
 

-        node = wxPendingEvents.First();
+        node = wxPendingEvents->First();

     }
 }
 #endif
     }
 }
 #endif


@@ -435,6 +435,13 @@ bool wxApp::Initialize()
 
     wxSystemSettings::Init();
 
 
     wxSystemSettings::Init();
 

+    // 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
+

 /*
     wxTheFontNameDirectory =  new wxFontNameDirectory;
     wxTheFontNameDirectory->Initialize();
 /*
     wxTheFontNameDirectory =  new wxFontNameDirectory;
     wxTheFontNameDirectory->Initialize();


@@ -495,6 +502,13 @@ void wxApp::CleanUp()
     delete wxTheApp;
     wxTheApp = (wxApp*) NULL;
 
     delete wxTheApp;
     wxTheApp = (wxApp*) 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
+

     wxSystemSettings::Done();
 
     delete[] wxBuffer;
     wxSystemSettings::Done();
 
     delete[] wxBuffer;

diff --git a/src/gtk/data.cpp b/src/gtk/data.cpp
index 57e16d0916f4d5ef7c5a098036efa01f748d8cbd..ad7aff2b3a48bb2ee02f0e944423d7f481a6842f 100644 (file)
--- a/src/gtk/data.cpp
+++ b/src/gtk/data.cpp
@@ -40,8 +40,8 @@ wxList wxPendingDelete;
 
 #if wxUSE_THREADS
 /* List of events pending processing */
 
 #if wxUSE_THREADS
 /* List of events pending processing */

-wxList wxPendingEvents;
-wxCriticalSection wxPendingEventsLocker;
+wxList *wxPendingEvents = NULL;
+wxCriticalSection *wxPendingEventsLocker = NULL;

 #endif
 
 /* Current cursor, in order to hang on to
 #endif
 
 /* Current cursor, in order to hang on to

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index 67a48aab5c001966d47b0c9ad67827d3204298c9..e37f422742a07d78efc95078dbbe0e75b3853f02 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -47,8 +47,8 @@ wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL;
 
 extern wxList wxPendingDelete;
 #if wxUSE_THREADS
 
 extern wxList wxPendingDelete;
 #if wxUSE_THREADS

-extern wxList wxPendingEvents;
-extern wxCriticalSection wxPendingEventsLocker;
+extern wxList *wxPendingEvents;
+extern wxCriticalSection *wxPendingEventsLocker;

 #endif
 extern wxResourceCache *wxTheResourceCache;
 
 #endif
 extern wxResourceCache *wxTheResourceCache;
 


@@ -380,8 +380,8 @@ void wxApp::Dispatch()
 #if wxUSE_THREADS
 void wxApp::ProcessPendingEvents()
 {
 #if wxUSE_THREADS
 void wxApp::ProcessPendingEvents()
 {

-    wxNode *node = wxPendingEvents.First();
-    wxCriticalSectionLocker locker(wxPendingEventsLocker);
+    wxNode *node = wxPendingEvents->First();
+    wxCriticalSectionLocker locker(*wxPendingEventsLocker);

 
     while (node)
     {
 
     while (node)
     {


@@ -391,7 +391,7 @@ void wxApp::ProcessPendingEvents()
 
         delete node;
 
 
         delete node;
 

-        node = wxPendingEvents.First();
+        node = wxPendingEvents->First();

     }
 }
 #endif
     }
 }
 #endif


@@ -435,6 +435,13 @@ bool wxApp::Initialize()
 
     wxSystemSettings::Init();
 
 
     wxSystemSettings::Init();
 

+    // 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
+

 /*
     wxTheFontNameDirectory =  new wxFontNameDirectory;
     wxTheFontNameDirectory->Initialize();
 /*
     wxTheFontNameDirectory =  new wxFontNameDirectory;
     wxTheFontNameDirectory->Initialize();


@@ -495,6 +502,13 @@ void wxApp::CleanUp()
     delete wxTheApp;
     wxTheApp = (wxApp*) NULL;
 
     delete wxTheApp;
     wxTheApp = (wxApp*) 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
+

     wxSystemSettings::Done();
 
     delete[] wxBuffer;
     wxSystemSettings::Done();
 
     delete[] wxBuffer;

diff --git a/src/gtk1/data.cpp b/src/gtk1/data.cpp
index 57e16d0916f4d5ef7c5a098036efa01f748d8cbd..ad7aff2b3a48bb2ee02f0e944423d7f481a6842f 100644 (file)
--- a/src/gtk1/data.cpp
+++ b/src/gtk1/data.cpp
@@ -40,8 +40,8 @@ wxList wxPendingDelete;
 
 #if wxUSE_THREADS
 /* List of events pending processing */
 
 #if wxUSE_THREADS
 /* List of events pending processing */

-wxList wxPendingEvents;
-wxCriticalSection wxPendingEventsLocker;
+wxList *wxPendingEvents = NULL;
+wxCriticalSection *wxPendingEventsLocker = NULL;

 #endif
 
 /* Current cursor, in order to hang on to
 #endif
 
 /* Current cursor, in order to hang on to

diff --git a/src/motif/app.cpp b/src/motif/app.cpp
index a58293df0e16585259a9390df8040e44bb39396f..b70716f889f56348a1437c90a52d2d0a3543f5c4 100644 (file)
--- a/src/motif/app.cpp
+++ b/src/motif/app.cpp
@@ -51,8 +51,8 @@ extern char *wxBuffer;
 extern wxList wxPendingDelete;
 
 #if wxUSE_THREADS
 extern wxList wxPendingDelete;
 
 #if wxUSE_THREADS

-extern wxList wxPendingEvents;
-extern wxCriticalSection wxPendingEventsLocker;
+extern wxList *wxPendingEvents;
+extern wxCriticalSection *wxPendingEventsLocker;

 #endif // wxUSE_THREADS
 
 wxApp *wxTheApp = NULL;
 #endif // wxUSE_THREADS
 
 wxApp *wxTheApp = NULL;


@@ -75,6 +75,13 @@ bool wxApp::Initialize()
 
     wxClassInfo::InitializeClasses();
 
 
     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();
 
     wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
     wxTheColourDatabase->Initialize();
 


@@ -152,6 +159,13 @@ void wxApp::CleanUp()
     delete wxTheApp;
     wxTheApp = NULL;
 
     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,
 #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()
 {
 #if wxUSE_THREADS
 void wxApp::ProcessPendingEvents()
 {

-    wxNode *node = wxPendingEvents.First();
-    wxCriticalSectionLocker locker(wxPendingEventsLocker);
+    wxNode *node = wxPendingEvents->First();
+    wxCriticalSectionLocker locker(*wxPendingEventsLocker);

 
     while (node)
     {
 
     while (node)
     {


@@ -506,7 +520,7 @@ void wxApp::ProcessPendingEvents()
         handler->ProcessPendingEvents();
 
         delete node;
         handler->ProcessPendingEvents();
 
         delete node;

-        node = wxPendingEvents.First();
+        node = wxPendingEvents->First();

     }
 }
 #endif // wxUSE_THREADS
     }
 }
 #endif // wxUSE_THREADS

diff --git a/src/motif/data.cpp b/src/motif/data.cpp
index f37d94fd39cc7f6289fb932c3eda09d3c3ea0934..52afe1decb102a4a042808caf1c734e2376c7d64 100644 (file)
--- a/src/motif/data.cpp
+++ b/src/motif/data.cpp
@@ -29,8 +29,8 @@ wxList wxPendingDelete;
 
 #if wxUSE_THREADS
 // List of events pending propagation
 
 #if wxUSE_THREADS
 // List of events pending propagation

-wxList wxPendingEvents;
-wxCriticalSection wxPendingEventsLocker;
+wxList *wxPendingEvents = NULL;
+wxCriticalSection *wxPendingEventsLocker = NULL;

 #endif
 
 int wxPageNumber;
 #endif
 
 int wxPageNumber;

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 71d518c4e772e4541189d045fce885bc04270927..be78f823197272033a8157f6a35ec3b61c709733 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -93,8 +93,8 @@ extern char *wxOsVersion;
 extern wxList *wxWinHandleList;
 extern wxList WXDLLEXPORT wxPendingDelete;
 #if wxUSE_THREADS
 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;
 #endif
 extern void wxSetKeyboardHook(bool doIt);
 extern wxCursor *g_globalCursor;


@@ -169,6 +169,12 @@ bool wxApp::Initialize()
     wxGetResource("wxWindows", "OsVersion", &wxOsVersion);
 #endif
 
     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();
 
     wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
     wxTheColourDatabase->Initialize();
 


@@ -551,6 +557,13 @@ void wxApp::CleanUp()
     if (wxWinHandleList)
         delete wxWinHandleList ;
 
     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;
     wxClassInfo::CleanUpClasses();
 
     delete wxTheApp;


@@ -922,8 +935,8 @@ bool wxApp::ProcessIdle()
 #if wxUSE_THREADS
 void wxApp::ProcessPendingEvents()
 {
 #if wxUSE_THREADS
 void wxApp::ProcessPendingEvents()
 {

-    wxNode *node = wxPendingEvents.First();
-    wxCriticalSectionLocker locker(wxPendingEventsLocker);
+    wxNode *node = wxPendingEvents->First();
+    wxCriticalSectionLocker locker(*wxPendingEventsLocker);

 
     while (node)
     {
 
     while (node)
     {


@@ -932,7 +945,7 @@ void wxApp::ProcessPendingEvents()
         handler->ProcessPendingEvents();
 
         delete node;
         handler->ProcessPendingEvents();
 
         delete node;

-        node = wxPendingEvents.First();
+        node = wxPendingEvents->First();

     }
 }
 #endif
     }
 }
 #endif

diff --git a/src/msw/data.cpp b/src/msw/data.cpp
index e8302954e763b8de7940a5189486d290747beab0..450f97e1a3aa0293f83994cf07d3c326adb6bab4 100644 (file)
--- a/src/msw/data.cpp
+++ b/src/msw/data.cpp
@@ -39,8 +39,8 @@ wxList WXDLLEXPORT wxPendingDelete;
 
 // List of events pending processing
 #if wxUSE_THREADS
 
 // List of events pending processing
 #if wxUSE_THREADS

-wxList wxPendingEvents;
-wxCriticalSection wxPendingEventsLocker;
+wxList *wxPendingEvents = NULL;
+wxCriticalSection *wxPendingEventsLocker = NULL;

 #endif
 
 // Current cursor, in order to hang on to
 #endif
 
 // Current cursor, in order to hang on to