include wx/object.h now that wxConfigBase derives from wxObject

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

diff --git a/include/wx/icon.h b/include/wx/icon.h
index 4bccbc43d95c56c6d455a2bfa998b315b54ae0b3..f4f92e7451ecac755c3db0cabed0c238eaeb0c1f 100644 (file)
--- a/include/wx/icon.h
+++ b/include/wx/icon.h
@@ -15,17 +15,22 @@
 #include "wx/iconloc.h"
 
 #if defined(__WXPALMOS__)
 #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__)
   #include "wx/motif/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__)
 #elif defined(__WXGTK__)

-  #include "wx/gtk/icon.h"
+  #include "wx/generic/icon.h"

 #elif defined(__WXX11__)
 #elif defined(__WXX11__)

-  #include "wx/x11/icon.h"
+  #include "wx/generic/icon.h"

 #elif defined(__WXMGL__)
 #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__)
 #elif defined(__WXMAC__)
   #include "wx/mac/icon.h"
 #elif defined(__WXCOCOA__)


@@ -34,5 +39,15 @@
   #include "wx/os2/icon.h"
 #endif
 
   #include "wx/os2/icon.h"
 #endif
 

+//-----------------------------------------------------------------------------
+// wxVariant support
+//-----------------------------------------------------------------------------
+
+#if wxUSE_VARIANT
+#include "wx/variant.h"
+DECLARE_VARIANT_OBJECT_EXPORTED(wxIcon,WXDLLEXPORT)
+#endif
+
+

 #endif
     // _WX_ICON_H_BASE_
 #endif
     // _WX_ICON_H_BASE_