Added separate SetFocusOnCanvas() function so that m_editorFocused will be more relia...

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

diff --git a/include/wx/icon.h b/include/wx/icon.h
index f4f92e7451ecac755c3db0cabed0c238eaeb0c1f..fbd402dc17a599efc27588d7e4df7492823bf49d 100644 (file)
--- a/include/wx/icon.h
+++ b/include/wx/icon.h
@@ -32,7 +32,11 @@
 #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__)
@@ -45,7 +49,7 @@
 
 #if wxUSE_VARIANT
 #include "wx/variant.h"
-DECLARE_VARIANT_OBJECT_EXPORTED(wxIcon,WXDLLEXPORT)
+DECLARE_VARIANT_OBJECT_EXPORTED(wxIcon,WXDLLIMPEXP_CORE)
 #endif