Add wxUSE_RIBBON to wx/setup_inc.h and wx/chkconf.h.

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

diff --git a/include/wx/msw/tls.h b/include/wx/msw/tls.h
index e7dc94023e6360189ca9bd4552de28a0aa0c4500..c27271ca6060a3e71a89eba8f907950150dc3e51 100644 (file)
--- a/include/wx/msw/tls.h
+++ b/include/wx/msw/tls.h
@@ -11,8 +11,6 @@
 #ifndef _WX_MSW_TLS_H_
 #define _WX_MSW_TLS_H_
 
 #ifndef _WX_MSW_TLS_H_
 #define _WX_MSW_TLS_H_
 

-#include "wx/log.h"
-

 #include "wx/msw/wrapwin.h"
 
 // ----------------------------------------------------------------------------
 #include "wx/msw/wrapwin.h"
 
 // ----------------------------------------------------------------------------


@@ -26,8 +24,6 @@ public:
     wxTlsKey()
     {
         m_slot = ::TlsAlloc();
     wxTlsKey()
     {
         m_slot = ::TlsAlloc();

-        if ( m_slot == TLS_OUT_OF_INDEXES )
-            wxLogError("Creating TLS key failed");

     }
 
     // return true if the key was successfully allocated
     }
 
     // return true if the key was successfully allocated


@@ -42,31 +38,20 @@ public:
     // change the key value, return true if ok
     bool Set(void *value)
     {
     // change the key value, return true if ok
     bool Set(void *value)
     {

-        if ( !::TlsSetValue(m_slot, value) )
-        {
-            wxLogSysError(_("Failed to set TLS value"));
-            return false;
-        }
-
-        return true;
+        return ::TlsSetValue(m_slot, value) != 0;

     }
 
     // free the key
     ~wxTlsKey()
     {
         if ( IsOk() )
     }
 
     // free the key
     ~wxTlsKey()
     {
         if ( IsOk() )

-        {
-            if ( !::TlsFree(m_slot) )
-            {
-                wxLogDebug("TlsFree() failed: %08x", ::GetLastError());
-            }
-        }
+            ::TlsFree(m_slot);

     }
 
 private:
     DWORD m_slot;
 
     }
 
 private:
     DWORD m_slot;
 

-    DECLARE_NO_COPY_CLASS(wxTlsKey)
+    wxDECLARE_NO_COPY_CLASS(wxTlsKey);

 };
 
 #endif // _WX_MSW_TLS_H_
 };
 
 #endif // _WX_MSW_TLS_H_