fix for bug reported by Robert and Julian, probably causes other problems

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

diff --git a/src/mac/icon.cpp b/src/mac/icon.cpp
index 2ae29d1859f82b125aee47479f3ef0e16ab84f85..5ec5f3ec80ee14571aea01c9ad8a472698435e6c 100644 (file)
--- a/src/mac/icon.cpp
+++ b/src/mac/icon.cpp
@@ -31,24 +31,23 @@ 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, int flags,
     int desiredWidth, int desiredHeight)
 {
 }
 
 wxIcon::wxIcon(const wxString& icon_file, int flags,
     int desiredWidth, int desiredHeight)

-

 {
     LoadFile(icon_file, (wxBitmapType) flags, desiredWidth, desiredHeight);
 }
 {
     LoadFile(icon_file, (wxBitmapType) flags, desiredWidth, desiredHeight);
 }


@@ -84,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 ;
     }