Support using GetTextExtent() with empty string to get descent in wxOSX.

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

diff --git a/include/wx/icon.h b/include/wx/icon.h
index bc4a80ad7e6d2a40d86122333d3533a8cca2e6e2..5eebb3f38e0d1286879112f291d23817ca60c85d 100644 (file)
--- a/include/wx/icon.h
+++ b/include/wx/icon.h
@@ -15,47 +15,49 @@
 #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(__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__)
-  #include "wx/generic/icon.h"
-#elif defined(__WXMSW__)
   #include "wx/msw/icon.h"
 #elif defined(__WXMOTIF__)
+  #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_XPM
   #include "wx/motif/icon.h"
 #elif defined(__WXGTK20__)
+  #ifdef __WINDOWS__
+    #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_ICO_RESOURCE
+  #else
+    #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_XPM
+  #endif
   #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(__WXMGL__)
+  #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_XPM
   #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
+  #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__)
+  #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_ICON_RESOURCE
   #include "wx/cocoa/icon.h"
 #elif defined(__WXPM__)
+  #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_ICO_RESOURCE
   #include "wx/os2/icon.h"
 #endif