X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f618020a15f1647a83aaeab1fe315f90497a9876..01cb1c26171efc494b94d77e4351362bb0eb2e7d:/include/wx/iconbndl.h?ds=sidebyside diff --git a/include/wx/iconbndl.h b/include/wx/iconbndl.h index 4022624360..8f04625360 100644 --- a/include/wx/iconbndl.h +++ b/include/wx/iconbndl.h @@ -12,11 +12,11 @@ #ifndef _WX_ICONBNDL_H_ #define _WX_ICONBNDL_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "iconbndl.h" #endif -#include "dynarray.h" +#include "wx/dynarray.h" // for wxSize #include "wx/gdicmn.h" @@ -32,16 +32,16 @@ class WXDLLEXPORT wxIconBundle { public: // default constructor - wxIconBundle() {} + wxIconBundle() : m_icons() {} // initializes the bundle with the icon(s) found in the file - wxIconBundle( const wxString& file, long type ) + wxIconBundle( const wxString& file, long type ) : m_icons() { AddIcon( file, type ); } // initializes the bundle with a single icon - wxIconBundle( const wxIcon& icon ) + wxIconBundle( const wxIcon& icon ) : m_icons() { AddIcon( icon ); } const wxIconBundle& operator =( const wxIconBundle& ic ); - wxIconBundle( const wxIconBundle& ic ) + wxIconBundle( const wxIconBundle& ic ) : m_icons() { *this = ic; } ~wxIconBundle() { DeleteIcons(); }