fix MSVC /Wp64 warnings

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

diff --git a/include/wx/icon.h b/include/wx/icon.h
index bd8703d1780b2f78aaaa3bd725f9aada130cba21..6696e9d2ceffc53694c4b2591cb13fecd292557b 100644 (file)
--- a/include/wx/icon.h
+++ b/include/wx/icon.h
@@ -1,29 +1,53 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/icon.h
+// Purpose:     wxIcon base header
+// Author:      Julian Smart
+// Modified by:
+// Created:
+// Copyright:   (c) Julian Smart
+// RCS-ID:      $Id$
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
 #ifndef _WX_ICON_H_BASE_
 #define _WX_ICON_H_BASE_
 
-/* Commenting out since duplicated in gdicmn.h
-// this is for Unix (i.e. now for anything other than MSW)
-#undef  wxICON
-#define wxICON(icon_name)   wxIcon(icon_name##_xpm)
-*/
+#include "wx/iconloc.h"
 
-#if defined(__WXMSW__)
+#if defined(__WXPALMOS__)
+  #include "wx/generic/icon.h"
+#elif defined(__WXMSW__)
   #include "wx/msw/icon.h"
 #elif defined(__WXMOTIF__)
   #include "wx/motif/icon.h"
+#elif defined(__WXGTK20__)
+  #include "wx/generic/icon.h"
 #elif defined(__WXGTK__)
-  #include "wx/gtk/icon.h"
+  #include "wx/generic/icon.h"
 #elif defined(__WXX11__)
-  #include "wx/x11/icon.h"
+  #include "wx/generic/icon.h"
 #elif defined(__WXMGL__)
-  #include "wx/mgl/icon.h"
+  #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"
+#elif defined(__WXCOCOA__)
+  #include "wx/cocoa/icon.h"
 #elif defined(__WXPM__)
   #include "wx/os2/icon.h"
-#elif defined(__WXSTUBS__)
-  #include "wx/stubs/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_