OSX regrouping

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54814 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-07-29 19:47:40 +00:00
parent f94a77989a
commit 26eef30437
9 changed files with 9 additions and 22 deletions
--- 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;