X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8f884a0dccd6b642f35c441ac9bfc87a6d5b4d35..8a18ea3f03ee46d13545a26156631ac102441fc1:/src/common/iconbndl.cpp?ds=sidebyside

diff --git a/src/common/iconbndl.cpp b/src/common/iconbndl.cpp
index 11b113004f..ab8ecc932d 100644
--- a/src/common/iconbndl.cpp
+++ b/src/common/iconbndl.cpp
@@ -68,7 +68,7 @@ wxIconBundle::wxIconBundle()
 {
 }
 
-wxIconBundle::wxIconBundle(const wxString& file, long type)
+wxIconBundle::wxIconBundle(const wxString& file, wxBitmapType type)
             : wxGDIObject()
 {
     AddIcon(file, type);
@@ -101,7 +101,7 @@ void wxIconBundle::DeleteIcons()
     UnRef();
 }
 
-void wxIconBundle::AddIcon(const wxString& file, long type)
+void wxIconBundle::AddIcon(const wxString& file, wxBitmapType type)
 {
 #ifdef __WXMAC__
     // Deal with standard icons
@@ -176,12 +176,12 @@ wxIcon wxIconBundle::GetIcon(const wxSize& size) const
 
                 // the best icon is by default (arbitrarily) the first one but
                 // if we find a system-sized icon, take it instead
-                if ( sx == sysX && sy == sysY || !iconBest.IsOk() )
+                if ((sx == sysX && sy == sysY) || !iconBest.IsOk())
                     iconBest = icon;
             }
     }
 
-#ifdef __WXMAC__
+#if defined( __WXMAC__ ) && wxOSX_USE_CARRBON
     return wxIcon(iconBest.GetHICON(), size);
 #else
     return iconBest;
@@ -238,3 +238,4 @@ wxIcon wxIconBundle::GetIconByIndex(size_t n) const
     return M_ICONBUNDLEDATA->m_icons[n];
 }
 
+