remove unused wxAppTraits-related files

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

diff --git a/include/wx/icon.h b/include/wx/icon.h
index cb6bc66b60b9795ae82c5d2a70f87610613738d9..6696e9d2ceffc53694c4b2591cb13fecd292557b 100644 (file)
--- a/include/wx/icon.h
+++ b/include/wx/icon.h
@@ -1,13 +1,53 @@
-#ifndef __ICONH_BASE__
-#define __ICONH_BASE__
-
-#if defined(__WINDOWS__)
-#include "wx/msw/icon.h"
-#elif defined(__MOTIF__)
-#include "wx/xt/icon.h"
-#elif defined(__GTK__)
-#include "wx/gtk/icon.h"
+/////////////////////////////////////////////////////////////////////////////
+// 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_
+
+#include "wx/iconloc.h"
+
+#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/generic/icon.h"
+#elif defined(__WXX11__)
+  #include "wx/generic/icon.h"
+#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"
+#elif defined(__WXCOCOA__)
+  #include "wx/cocoa/icon.h"
+#elif defined(__WXPM__)
+  #include "wx/os2/icon.h"

 #endif
 
 #endif
 

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

 #endif
 #endif

-    // __ICONH_BASE__
+    // _WX_ICON_H_BASE_