applied SourceForge patch # 544164 (hidden virtual method in wxMenuBar)

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

diff --git a/src/mac/icon.cpp b/src/mac/icon.cpp
index 0133e455347707e03048dcc5387f494ed4f797fd..5ec5f3ec80ee14571aea01c9ad8a472698435e6c 100644 (file)
--- a/src/mac/icon.cpp
+++ b/src/mac/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
  */


@@ -28,33 +31,32 @@ wxIcon::wxIcon()
 }
 
 wxIcon::wxIcon(const char bits[], int width, int height) :
 }
 
 wxIcon::wxIcon(const char bits[], int width, int height) :

-    wxBitmap(bits,width,height )
+    wxBitmap(bits, width, height)

 {
     
 }
 
 wxIcon::wxIcon( const char **bits ) :
 {
     
 }
 
 wxIcon::wxIcon( const char **bits ) :

-    wxBitmap(bits  )
+    wxBitmap(bits)

 {
 }
 
 wxIcon::wxIcon( char **bits ) :
 {
 }
 
 wxIcon::wxIcon( char **bits ) :

-    wxBitmap(bits )
+    wxBitmap(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();


@@ -81,7 +83,7 @@ bool  wxICONResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, lo
           int desiredWidth, int desiredHeight)
 {
        short theId = -1 ;
           int desiredWidth, int desiredHeight)
 {
        short theId = -1 ;

-    if ( name == "wxICON_INFO" )
+    if ( name == "wxICON_INFORMATION" )

     {
         theId = kNoteIcon ;
     }
     {
         theId = kNoteIcon ;
     }