access TLS cache variable directly and not via a helper function when using compiler...

[wxWidgets.git] / include / wx / icon.h

diff --git a/include/wx/icon.h b/include/wx/icon.h
index 50dda58d637c92d934548a46f8b670006ea771ec..fbd402dc17a599efc27588d7e4df7492823bf49d 100644 (file)
--- a/include/wx/icon.h
+++ b/include/wx/icon.h
@@ -15,7 +15,7 @@
 #include "wx/iconloc.h"
 
 #if defined(__WXPALMOS__)
-  #include "wx/palmos/icon.h"
+  #include "wx/generic/icon.h"
 #elif defined(__WXMSW__)
   #include "wx/msw/icon.h"
 #elif defined(__WXMOTIF__)
@@ -29,13 +29,29 @@
 #elif defined(__WXMGL__)
   #define wxICON_DEFAULT_BITMAP_TYPE wxBITMAP_TYPE_ICO_RESOURCE
   #include "wx/generic/icon.h"
+#elif defined(__WXDFB__)
+  #include "wx/generic/icon.h"
 #elif defined(__WXMAC__)
-  #include "wx/mac/icon.h"
+#if wxOSX_USE_COCOA_OR_CARBON
+  #include "wx/osx/icon.h"
+#else
+  #include "wx/generic/icon.h"
+#endif
 #elif defined(__WXCOCOA__)
   #include "wx/cocoa/icon.h"
 #elif defined(__WXPM__)
   #include "wx/os2/icon.h"
 #endif
 
+//-----------------------------------------------------------------------------
+// wxVariant support
+//-----------------------------------------------------------------------------
+
+#if wxUSE_VARIANT
+#include "wx/variant.h"
+DECLARE_VARIANT_OBJECT_EXPORTED(wxIcon,WXDLLIMPEXP_CORE)
+#endif
+
+
 #endif
     // _WX_ICON_H_BASE_