improve best size calculation; notably account for wxDP_ALLOWNONE

[wxWidgets.git] / src / common / iconbndl.cpp

diff --git a/src/common/iconbndl.cpp b/src/common/iconbndl.cpp
index 509044fadd07793d96358f95297c4f7903383081..ab8ecc932d6ec1abd9e527e3008888b96fd2537b 100644 (file)
--- a/src/common/iconbndl.cpp
+++ b/src/common/iconbndl.cpp
@@ -181,7 +181,7 @@ wxIcon wxIconBundle::GetIcon(const wxSize& size) const
             }
     }
 
-#ifdef __WXMAC__
+#if defined( __WXMAC__ ) && wxOSX_USE_CARRBON
     return wxIcon(iconBest.GetHICON(), size);
 #else
     return iconBest;