Committed Jaako's renderer patch

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

diff --git a/include/wx/iconbndl.h b/include/wx/iconbndl.h
index 869f93e3c2ed032d200ebe7fe570678375ee27e3..3749467240b63a30a6827098bb7e2ced603f46b6 100644 (file)
--- a/include/wx/iconbndl.h
+++ b/include/wx/iconbndl.h
@@ -6,22 +6,18 @@
 // Created:     23.03.02
 // RCS-ID:      $Id$
 // Copyright:   (c) Mattia Barbon
 // Created:     23.03.02
 // RCS-ID:      $Id$
 // Copyright:   (c) Mattia Barbon

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ICONBNDL_H_
 #define _WX_ICONBNDL_H_
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ICONBNDL_H_
 #define _WX_ICONBNDL_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "iconbndl.h"
-#endif
-

 #include "wx/dynarray.h"
 // for wxSize
 #include "wx/gdicmn.h"
 
 #include "wx/dynarray.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 );
 


@@ -60,7 +56,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