Initial work on virtual file system support for the WebKitGTK+ backend. It now suppor...

[wxWidgets.git] / include / wx / unix / tls.h

diff --git a/include/wx/unix/tls.h b/include/wx/unix/tls.h
index 126ccd2b17be80bf0139d84a47a244c24c6cab42..05f92b7fb9a7d51e5edd3dc473142195ac9f281a 100644 (file)
--- a/include/wx/unix/tls.h
+++ b/include/wx/unix/tls.h
@@ -21,10 +21,10 @@ class wxTlsKey
 {
 public:
     // ctor allocates a new key and possibly registering a destructor function
-    // for it (notice that using destructor function is Pthreads-specific and
-    // not supported in Win32 implementation)
-    wxTlsKey(void (*destructor)(void *) = NULL)
+    // for it
+    wxTlsKey(wxTlsDestructorFunction destructor)
     {
+        m_destructor = destructor;
         if ( pthread_key_create(&m_key, destructor) != 0 )
             m_key = 0;
     }
@@ -41,6 +41,10 @@ public:
     // change the key value, return true if ok
     bool Set(void *value)
     {
+        void *old = Get();
+        if ( old )
+            m_destructor(old);
+
         return pthread_setspecific(m_key, value) == 0;
     }
 
@@ -52,6 +56,7 @@ public:
     }
 
 private:
+    wxTlsDestructorFunction m_destructor;
     pthread_key_t m_key;
 
     wxDECLARE_NO_COPY_CLASS(wxTlsKey);