avoid setting initial position if it was not specified, broken in r70734

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

diff --git a/src/osx/carbon/icon.cpp b/src/osx/carbon/icon.cpp
index d99c5a1e64a1a06817d131219e851eb015ce8f1e..51b3e34f4022ffb27043ba1e32ed8aa22e59ab7b 100644 (file)
--- a/src/osx/carbon/icon.cpp
+++ b/src/osx/carbon/icon.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01

-// RCS-ID:      $Id$

 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -137,21 +136,21 @@ wxIcon::CloneGDIRefData(const wxGDIRefData * WXUNUSED(data)) const
 
 WXHICON wxIcon::GetHICON() const
 {
 
 WXHICON wxIcon::GetHICON() const
 {

-    wxASSERT( Ok() ) ;
+    wxASSERT( IsOk() ) ;

 
     return (WXHICON) ((wxIconRefData*)m_refData)->GetHICON() ;
 }
 
 int wxIcon::GetWidth() const
 {
 
     return (WXHICON) ((wxIconRefData*)m_refData)->GetHICON() ;
 }
 
 int wxIcon::GetWidth() const
 {

-   wxCHECK_MSG( Ok(), -1, wxT("invalid icon") );
+   wxCHECK_MSG( IsOk(), -1, wxT("invalid icon") );

 
    return M_ICONDATA->GetWidth();
 }
 
 int wxIcon::GetHeight() const
 {
 
    return M_ICONDATA->GetWidth();
 }
 
 int wxIcon::GetHeight() const
 {

-   wxCHECK_MSG( Ok(), -1, wxT("invalid icon") );
+   wxCHECK_MSG( IsOk(), -1, wxT("invalid icon") );

 
    return M_ICONDATA->GetHeight();
 }
 
    return M_ICONDATA->GetHeight();
 }


@@ -381,7 +380,7 @@ bool wxIcon::LoadIconFromFile(const wxString& filename, int desiredWidth, int de
 
     if( err == noErr )
     {
 
     if( err == noErr )
     {

-        // If everthing is OK, assign m_refData
+        // If everything is OK, assign m_refData

         m_refData = new wxIconRefData( (WXHICON) iconRef, desiredWidth, desiredHeight );
         result = true;
     }
         m_refData = new wxIconRefData( (WXHICON) iconRef, desiredWidth, desiredHeight );
         result = true;
     }


@@ -414,7 +413,7 @@ bool wxIcon::LoadIconAsBitmap(const wxString& filename, wxBitmapType type, int d
     else
     {
         wxImage loadimage( filename, type );
     else
     {
         wxImage loadimage( filename, type );

-        if (loadimage.Ok())
+        if (loadimage.IsOk())

         {
             if ( desiredWidth == -1 )
                 desiredWidth = loadimage.GetWidth() ;
         {
             if ( desiredWidth == -1 )
                 desiredWidth = loadimage.GetWidth() ;


@@ -467,7 +466,7 @@ bool  wxICONResourceHandler::LoadFile(
     if ( icon.LoadFile( name , wxBITMAP_TYPE_ICON_RESOURCE , desiredWidth , desiredHeight ) )
     {
         bitmap->CopyFromIcon( icon ) ;
     if ( icon.LoadFile( name , wxBITMAP_TYPE_ICON_RESOURCE , desiredWidth , desiredHeight ) )
     {
         bitmap->CopyFromIcon( icon ) ;

-        return bitmap->Ok() ;
+        return bitmap->IsOk() ;

     }
     return false;
 }
     }
     return false;
 }