fixing reset clip

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

diff --git a/src/mac/carbon/icon.cpp b/src/mac/carbon/icon.cpp
index 3473bf72baf3c9f993e1185c103a0ee4d4155010..7084b59cfcd6f6e2a6f545c18f3c577fb1cf75a0 100644 (file)
--- a/src/mac/carbon/icon.cpp
+++ b/src/mac/carbon/icon.cpp
@@ -1,18 +1,22 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        icon.cpp
+// Name:        src/mac/carbon/icon.cpp

 // Purpose:     wxIcon class
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Purpose:     wxIcon class
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

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

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 
 #include "wx/icon.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 
 #include "wx/icon.h"

-#include "wx/image.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/image.h"
+#endif
+

 #include "wx/mac/private.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
 #include "wx/mac/private.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)


@@ -91,7 +95,7 @@ void wxIcon::SetHeight( int height )
 {
 }
 
 {
 }
 

-bool wxIcon::Ok() const
+bool wxIcon::IsOk() const

 {
     return m_refData != NULL ;
 }
 {
     return m_refData != NULL ;
 }


@@ -180,7 +184,7 @@ bool wxIcon::LoadFile(
                     desiredHeight = loadimage.GetHeight() ;
                 if ( desiredWidth != loadimage.GetWidth() || desiredHeight != loadimage.GetHeight() )
                     loadimage.Rescale( desiredWidth , desiredHeight ) ;
                     desiredHeight = loadimage.GetHeight() ;
                 if ( desiredWidth != loadimage.GetWidth() || desiredHeight != loadimage.GetHeight() )
                     loadimage.Rescale( desiredWidth , desiredHeight ) ;

-    
+

                 wxBitmap bmp( loadimage );
                 CopyFromBitmap( bmp ) ;
 
                 wxBitmap bmp( loadimage );
                 CopyFromBitmap( bmp ) ;