made wx[Array]TreeItemId[s] more backwards compatible

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

diff --git a/include/wx/iconbndl.h b/include/wx/iconbndl.h
index 4022624360c5400cb498e9719e56d869ce57f001..8f04625360a17f28970726b35fd722de86dcc1d8 100644 (file)
--- a/include/wx/iconbndl.h
+++ b/include/wx/iconbndl.h
@@ -12,11 +12,11 @@
 #ifndef _WX_ICONBNDL_H_
 #define _WX_ICONBNDL_H_
 
 #ifndef _WX_ICONBNDL_H_
 #define _WX_ICONBNDL_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "iconbndl.h"
 #endif
 
 #pragma interface "iconbndl.h"
 #endif
 

-#include "dynarray.h"
+#include "wx/dynarray.h"

 // for wxSize
 #include "wx/gdicmn.h"
 
 // for wxSize
 #include "wx/gdicmn.h"
 


@@ -32,16 +32,16 @@ class WXDLLEXPORT wxIconBundle
 {
 public:
     // default constructor
 {
 public:
     // default constructor

-    wxIconBundle() {}
+    wxIconBundle() : m_icons() {}

     // initializes the bundle with the icon(s) found in the file
     // 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
         { 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 );
         { AddIcon( icon ); }
 
     const wxIconBundle& operator =( const wxIconBundle& ic );

-    wxIconBundle( const wxIconBundle& ic )
+    wxIconBundle( const wxIconBundle& ic ) : m_icons()

         { *this = ic; }
 
     ~wxIconBundle() { DeleteIcons(); }
         { *this = ic; }
 
     ~wxIconBundle() { DeleteIcons(); }