Added Aleksandras' framelayout code, with more or less working Linux Makefiles

[wxWidgets.git] / src / common / string.cpp

diff --git a/src/common/string.cpp b/src/common/string.cpp
index 37a116fa020d4e9561cad08cbee96e751e4e46f2..fbdedd721eb8ef53b258c45ec238f2c0e732f137 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -1461,12 +1461,16 @@ void wxArrayString::Remove(const char *sz)
 
   // need a critical section to protect access to gs_compareFunction and
   // gs_sortAscending variables
 
   // need a critical section to protect access to gs_compareFunction and
   // gs_sortAscending variables

-  static wxCriticalSection gs_critsectStringSort;
+  static wxCriticalSection *gs_critsectStringSort = NULL;

 
   // call this before the value of the global sort vars is changed/after
   // you're finished with them
 
   // call this before the value of the global sort vars is changed/after
   // you're finished with them

-  #define START_SORT()     gs_critsectStringSort.Enter()
-  #define END_SORT()       gs_critsectStringSort.Leave()
+  #define START_SORT()     wxASSERT( !gs_critsectStringSort );                \
+                           gs_critsectStringSort = new wxCriticalSection;     \
+                           gs_critsectStringSort->Enter()
+  #define END_SORT()       gs_critsectStringSort->Leave();                    \
+                           delete gs_critsectStringSort;                      \
+                           gs_critsectStringSort = NULL

 #else // !threads
   #define START_SORT()
   #define END_SORT()
 #else // !threads
   #define START_SORT()
   #define END_SORT()