Rebake from clean wx tree.

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

diff --git a/include/wx/icon.h b/include/wx/icon.h
index bc4a80ad7e6d2a40d86122333d3533a8cca2e6e2..5dca8e8b131fea8a0cff4bb956c775f15a57db88 100644 (file)
--- a/include/wx/icon.h
+++ b/include/wx/icon.h
@@ -15,47 +15,51 @@
 #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.
 // 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(__WXMSW__)
-  #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_ICO_RESOURCE
-#elif defined(__WXMGL__)
-  #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_ICO_RESOURCE
-#elif defined(__WXMAC__) && wxOSX_USE_COCOA_OR_CARBON
-  #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_ICON_RESOURCE
-#else
-  #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_XPM
-#endif
-
-// a more readable way to tell
-#define wxICON_SCREEN_DEPTH     (-1)

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

+  #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_XPM

   #include "wx/generic/icon.h"
 #elif defined(__WXMSW__)
   #include "wx/generic/icon.h"
 #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__)

+  #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_XPM

   #include "wx/generic/icon.h"
 #elif defined(__WXGTK__)
   #include "wx/generic/icon.h"
 #elif defined(__WXGTK__)

+  #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_XPM

   #include "wx/generic/icon.h"
 #elif defined(__WXX11__)
   #include "wx/generic/icon.h"
 #elif defined(__WXX11__)

+  #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_XPM

   #include "wx/generic/icon.h"
 #elif defined(__WXMGL__)
   #include "wx/generic/icon.h"
 #elif defined(__WXMGL__)

+  #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_ICO_RESOURCE

   #include "wx/generic/icon.h"
 #elif defined(__WXDFB__)
   #include "wx/generic/icon.h"
 #elif defined(__WXDFB__)

+  #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_XPM

   #include "wx/generic/icon.h"
 #elif defined(__WXMAC__)
 #if wxOSX_USE_COCOA_OR_CARBON
   #include "wx/generic/icon.h"
 #elif defined(__WXMAC__)
 #if wxOSX_USE_COCOA_OR_CARBON

+  #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_ICON_RESOURCE

   #include "wx/osx/icon.h"
 #else
   #include "wx/osx/icon.h"
 #else

+  #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_XPM

   #include "wx/generic/icon.h"
 #endif
 #elif defined(__WXCOCOA__)
   #include "wx/generic/icon.h"
 #endif
 #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