added constructor for compliance with wxPython

[wxWidgets.git] / src / mac / carbon / icon.cpp

diff --git a/src/mac/carbon/icon.cpp b/src/mac/carbon/icon.cpp
index 0133e455347707e03048dcc5387f494ed4f797fd..2ae29d1859f82b125aee47479f3ef0e16ab84f85 100644 (file)
--- a/src/mac/carbon/icon.cpp
+++ b/src/mac/carbon/icon.cpp
@@ -19,6 +19,9 @@
 IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
 #endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
 #endif
 

+#include "wx/mac/private.h"
+
+

 /*
  * Icons
  */
 /*
  * Icons
  */


@@ -43,18 +46,18 @@ wxIcon::wxIcon( char **bits ) :
 {
 }
 
 {
 }
 

-wxIcon::wxIcon(const wxString& icon_file, long flags,
+wxIcon::wxIcon(const wxString& icon_file, int flags,

     int desiredWidth, int desiredHeight)
 
 {
     int desiredWidth, int desiredHeight)
 
 {

-    LoadFile(icon_file, flags, desiredWidth, desiredHeight);
+    LoadFile(icon_file, (wxBitmapType) flags, desiredWidth, desiredHeight);

 }
 
 wxIcon::~wxIcon()
 {
 }
 
 }
 
 wxIcon::~wxIcon()
 {
 }
 

-bool wxIcon::LoadFile(const wxString& filename, long type,
+bool wxIcon::LoadFile(const wxString& filename, wxBitmapType type,

     int desiredWidth, int desiredHeight)
 {
   UnRef();
     int desiredWidth, int desiredHeight)
 {
   UnRef();