made FindWindow() member functions const (this makes it possible to use XRCCTRL(...

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

diff --git a/include/wx/iconbndl.h b/include/wx/iconbndl.h
index fa7dae30cd33469bd55a7efef3cbe0167813fa87..46bb7171f5ecc9554e354fcfd39803255492d340 100644 (file)
--- a/include/wx/iconbndl.h
+++ b/include/wx/iconbndl.h
@@ -12,7 +12,7 @@
 #ifndef _WX_ICONBNDL_H_
 #define _WX_ICONBNDL_H_
 
 #ifndef _WX_ICONBNDL_H_
 #define _WX_ICONBNDL_H_
 

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

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


@@ -20,8 +20,8 @@
 // for wxSize
 #include "wx/gdicmn.h"
 
 // for wxSize
 #include "wx/gdicmn.h"
 

-class WXDLLEXPORT wxIcon;
-class WXDLLEXPORT wxString;
+class WXDLLIMPEXP_CORE wxIcon;
+class WXDLLIMPEXP_BASE wxString;

 
 WX_DECLARE_EXPORTED_OBJARRAY( wxIcon, wxIconArray );
 
 
 WX_DECLARE_EXPORTED_OBJARRAY( wxIcon, wxIconArray );
 


@@ -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(); }


@@ -60,7 +60,7 @@ public:
     // returns the first icon in the bundle
     const wxIcon& GetIcon( const wxSize& size ) const;
     // equivalent to GetIcon( wxSize( size, size ) )
     // returns the first icon in the bundle
     const wxIcon& GetIcon( const wxSize& size ) const;
     // equivalent to GetIcon( wxSize( size, size ) )

-    const wxIcon& GetIcon( wxCoord size = -1 ) const
+    const wxIcon& GetIcon( wxCoord size = wxDefaultCoord ) const

         { return GetIcon( wxSize( size, size ) ); }
 private:
     // delete all icons
         { return GetIcon( wxSize( size, size ) ); }
 private:
     // delete all icons