Added wxRIBBON_PANEL_FLEXIBLE flag to allow toolbars to wrap, taking up the optimum...

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

diff --git a/include/wx/icon.h b/include/wx/icon.h
index f4f92e7451ecac755c3db0cabed0c238eaeb0c1f..3b7b9b20a53ca9a68cf70fee771c133afab05585 100644 (file)
--- a/include/wx/icon.h
+++ b/include/wx/icon.h
@@ -14,28 +14,46 @@
 
 #include "wx/iconloc.h"
 
 
 #include "wx/iconloc.h"
 

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

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

   #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__)
   #include "wx/generic/icon.h"
 #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_PNG_RESOURCE
+  #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
 


@@ -45,7 +63,7 @@
 
 #if wxUSE_VARIANT
 #include "wx/variant.h"
 
 #if wxUSE_VARIANT
 #include "wx/variant.h"

-DECLARE_VARIANT_OBJECT_EXPORTED(wxIcon,WXDLLEXPORT)
+DECLARE_VARIANT_OBJECT_EXPORTED(wxIcon,WXDLLIMPEXP_CORE)

 #endif
 
 
 #endif