fix compilation after r50329

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

diff --git a/src/mac/carbon/icon.cpp b/src/mac/carbon/icon.cpp
index 2d7a1a16b26ea23ae3de3e68b3a0bc00a027bb78..004b47fc6eb3e62ef74b06f9b73b1cb2be638a07 100644 (file)
--- a/src/mac/carbon/icon.cpp
+++ b/src/mac/carbon/icon.cpp
@@ -19,28 +19,32 @@
 
 #include "wx/mac/private.h"
 
 
 #include "wx/mac/private.h"
 

-IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
+IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxGDIObject)

 
 #define M_ICONDATA ((wxIconRefData *)m_refData)
 
 class WXDLLEXPORT wxIconRefData : public wxGDIRefData
 {
 public:
 
 #define M_ICONDATA ((wxIconRefData *)m_refData)
 
 class WXDLLEXPORT wxIconRefData : public wxGDIRefData
 {
 public:

-    wxIconRefData();
+    wxIconRefData() { Init(); }

     wxIconRefData( WXHICON iconref, int desiredWidth, int desiredHeight );
     virtual ~wxIconRefData() { Free(); }
     wxIconRefData( WXHICON iconref, int desiredWidth, int desiredHeight );
     virtual ~wxIconRefData() { Free(); }

-    
-    void Init();
+
+    virtual bool IsOk() const { return m_iconRef != NULL; }
+

     virtual void Free();
     virtual void Free();

-    
+

     void SetWidth( int width ) { m_width = width; }
     void SetHeight( int height ) { m_height = height; }
     void SetWidth( int width ) { m_width = width; }
     void SetHeight( int height ) { m_height = height; }

-    
+

     int GetWidth() const { return m_width; }
     int GetHeight() const { return m_height; }
     int GetWidth() const { return m_width; }
     int GetHeight() const { return m_height; }

-    
+

     WXHICON GetHICON() const { return (WXHICON) m_iconRef; }
     WXHICON GetHICON() const { return (WXHICON) m_iconRef; }

-    private :
+
+private:
+    void Init();
+

     IconRef m_iconRef;
     int m_width;
     int m_height;
     IconRef m_iconRef;
     int m_width;
     int m_height;


@@ -50,7 +54,7 @@ public:
 wxIconRefData::wxIconRefData( WXHICON icon, int desiredWidth, int desiredHeight )
 {
     m_iconRef = MAC_WXHICON( icon ) ;
 wxIconRefData::wxIconRefData( WXHICON icon, int desiredWidth, int desiredHeight )
 {
     m_iconRef = MAC_WXHICON( icon ) ;

-    
+

     // Standard sizes
     SetWidth( desiredWidth == -1 ? 32 : desiredWidth ) ;
     SetHeight( desiredHeight == -1 ? 32 : desiredHeight ) ;
     // Standard sizes
     SetWidth( desiredWidth == -1 ? 32 : desiredWidth ) ;
     SetHeight( desiredHeight == -1 ? 32 : desiredHeight ) ;


@@ -59,6 +63,8 @@ wxIconRefData::wxIconRefData( WXHICON icon, int desiredWidth, int desiredHeight
 void wxIconRefData::Init()
 {
     m_iconRef = NULL ;
 void wxIconRefData::Init()
 {
     m_iconRef = NULL ;

+    m_width =
+    m_height = 0;

 }
 
 void wxIconRefData::Free()
 }
 
 void wxIconRefData::Free()


@@ -117,6 +123,16 @@ wxIcon::~wxIcon()
 {
 }
 
 {
 }
 

+wxGDIRefData *wxIcon::CreateGDIRefData() const
+{
+    return new wxIconRefData;
+}
+
+wxGDIRefData *wxIcon::CloneGDIRefData(const wxGDIRefData *data) const
+{
+    return new wxIconRefData(*wx_static_cast(const wxIconRefData *, data));
+}
+

 WXHICON wxIcon::GetHICON() const
 {
     wxASSERT( Ok() ) ;
 WXHICON wxIcon::GetHICON() const
 {
     wxASSERT( Ok() ) ;


@@ -155,11 +171,6 @@ void wxIcon::SetHeight( int WXUNUSED(height) )
 {
 }
 
 {
 }
 

-bool wxIcon::IsOk() const
-{
-    return m_refData != NULL ;
-}
-

 bool wxIcon::LoadFile(
     const wxString& filename, wxBitmapType type,
     int desiredWidth, int desiredHeight )
 bool wxIcon::LoadFile(
     const wxString& filename, wxBitmapType type,
     int desiredWidth, int desiredHeight )


@@ -200,34 +211,34 @@ bool wxIcon::LoadFile(
         }
         else
         {
         }
         else
         {

-               IconRef iconRef = NULL ;
-               
-               // first look in the resource fork
-               if ( iconRef == NULL )
-               {
-                       Str255 theName ;
-
-                       wxMacStringToPascal( filename , theName ) ;
-                       Handle resHandle = GetNamedResource( 'icns' , theName ) ;
-                       if ( resHandle != 0L )
-                       {
-                                       IconFamilyHandle iconFamily = (IconFamilyHandle) resHandle ;
+            IconRef iconRef = NULL ;
+
+            // first look in the resource fork
+            if ( iconRef == NULL )
+            {
+                Str255 theName ;
+
+                wxMacStringToPascal( filename , theName ) ;
+                Handle resHandle = GetNamedResource( 'icns' , theName ) ;
+                if ( resHandle != 0L )
+                {
+                    IconFamilyHandle iconFamily = (IconFamilyHandle) resHandle ;

                     HLock((Handle) iconFamily);
                     OSStatus err = GetIconRefFromIconFamilyPtr( *iconFamily, GetHandleSize((Handle) iconFamily), &iconRef );
                     HUnlock((Handle) iconFamily);
                     wxASSERT_MSG( err == noErr , wxT("Error when constructing icon ref") );
                     ReleaseResource( resHandle ) ;
                     HLock((Handle) iconFamily);
                     OSStatus err = GetIconRefFromIconFamilyPtr( *iconFamily, GetHandleSize((Handle) iconFamily), &iconRef );
                     HUnlock((Handle) iconFamily);
                     wxASSERT_MSG( err == noErr , wxT("Error when constructing icon ref") );
                     ReleaseResource( resHandle ) ;

-                       }
-                       }
+                }
+              }

             if ( iconRef == NULL )
             {
                 // TODO add other attempts to load it from files etc here
             }
             if ( iconRef == NULL )
             {
                 // TODO add other attempts to load it from files etc here
             }

-                       if ( iconRef )
-                       {
-                       m_refData = new wxIconRefData( (WXHICON) iconRef, desiredWidth, desiredHeight ) ;
-                       return true ;
-                       }       
+               if ( iconRef )
+               {
+                   m_refData = new wxIconRefData( (WXHICON) iconRef, desiredWidth, desiredHeight ) ;
+                return true ;
+               }

         }
 
         if ( theId != 0 )
         }
 
         if ( theId != 0 )