no changes, just remove #if'd out code

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

diff --git a/include/wx/icon.h b/include/wx/icon.h
index bcf9c53ca8df4b125625a5a376e9b217d7bf56aa..5dca8e8b131fea8a0cff4bb956c775f15a57db88 100644 (file)
--- a/include/wx/icon.h
+++ b/include/wx/icon.h
@@ -14,27 +14,64 @@
 
 #include "wx/iconloc.h"
 
 
 #include "wx/iconloc.h"
 

+
+// a more readable way to tell
+#define wxICON_SCREEN_DEPTH     (-1)
+
+
+// the wxICON_DEFAULT_TYPE (the wxIcon equivalent of wxBITMAP_DEFAULT_TYPE)
+// constant defines the default argument value for wxIcon ctor and wxIcon::LoadFile()
+// functions.
+

 #if defined(__WXPALMOS__)
 #if defined(__WXPALMOS__)

-  #include "wx/palmos/icon.h"
+  #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_XPM
+  #include "wx/generic/icon.h"

 #elif defined(__WXMSW__)
 #elif defined(__WXMSW__)

+  #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_ICO_RESOURCE

   #include "wx/msw/icon.h"
 #elif defined(__WXMOTIF__)
   #include "wx/msw/icon.h"
 #elif defined(__WXMOTIF__)

+  #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_XPM

   #include "wx/motif/icon.h"
 #elif defined(__WXGTK20__)
   #include "wx/motif/icon.h"
 #elif defined(__WXGTK20__)

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

 #elif defined(__WXGTK__)
 #elif defined(__WXGTK__)

-  #include "wx/gtk1/icon.h"
+  #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_XPM
+  #include "wx/generic/icon.h"

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

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

 #elif defined(__WXMGL__)
 #elif defined(__WXMGL__)

-  #include "wx/mgl/icon.h"
+  #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_ICO_RESOURCE
+  #include "wx/generic/icon.h"
+#elif defined(__WXDFB__)
+  #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_XPM
+  #include "wx/generic/icon.h"

 #elif defined(__WXMAC__)
 #elif defined(__WXMAC__)

-  #include "wx/mac/icon.h"
+#if wxOSX_USE_COCOA_OR_CARBON
+  #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_ICON_RESOURCE
+  #include "wx/osx/icon.h"
+#else
+  #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_XPM
+  #include "wx/generic/icon.h"
+#endif

 #elif defined(__WXCOCOA__)
 #elif defined(__WXCOCOA__)

+  #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_ICON_RESOURCE

   #include "wx/cocoa/icon.h"
 #elif defined(__WXPM__)
   #include "wx/cocoa/icon.h"
 #elif defined(__WXPM__)

+  #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_ICO_RESOURCE

   #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,WXDLLIMPEXP_CORE)
+#endif
+
+

 #endif
     // _WX_ICON_H_BASE_
 #endif
     // _WX_ICON_H_BASE_