Use FillHilite style

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

diff --git a/src/mac/carbon/icon.cpp b/src/mac/carbon/icon.cpp
index a3bd7817c1a5f1957437942df5d378e2bd692343..2d7a1a16b26ea23ae3de3e68b3a0bc00a027bb78 100644 (file)
--- a/src/mac/carbon/icon.cpp
+++ b/src/mac/carbon/icon.cpp
@@ -1,71 +1,126 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "icon.h"
-#endif
-

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

-#if !USE_SHARED_LIBRARIES
-IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
+#ifndef WX_PRECOMP
+    #include "wx/image.h"

 #endif
 
 #endif
 

-#include "wx/image.h"

 #include "wx/mac/private.h"
 
 #include "wx/mac/private.h"
 

+IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
+

 #define M_ICONDATA ((wxIconRefData *)m_refData)
 
 #define M_ICONDATA ((wxIconRefData *)m_refData)
 

+class WXDLLEXPORT wxIconRefData : public wxGDIRefData
+{
+public:
+    wxIconRefData();
+    wxIconRefData( WXHICON iconref, int desiredWidth, int desiredHeight );
+    virtual ~wxIconRefData() { Free(); }
+    
+    void Init();
+    virtual void Free();
+    
+    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; }
+    
+    WXHICON GetHICON() const { return (WXHICON) m_iconRef; }
+    private :
+    IconRef m_iconRef;
+    int m_width;
+    int m_height;
+};
+
+
+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 ) ;
+}

 
 

-/*
- * Icons
- */
+void wxIconRefData::Init()
+{
+    m_iconRef = NULL ;
+}
+
+void wxIconRefData::Free()
+{
+    if ( m_iconRef )
+    {
+        ReleaseIconRef( m_iconRef ) ;
+        m_iconRef = NULL ;
+    }
+}
+
+//
+//
+//

 
 wxIcon::wxIcon()
 {
 }
 
 
 wxIcon::wxIcon()
 {
 }
 

-wxIcon::wxIcon(const char bits[], int width, int height) 
+wxIcon::wxIcon( const char bits[], int width, int height )

 {
 {

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

     CopyFromBitmap( bmp ) ;
 }
 
     CopyFromBitmap( bmp ) ;
 }
 

-wxIcon::wxIcon( const char **bits ) 
+wxIcon::wxIcon( const char **bits )

 {
 {

-    wxBitmap bmp(bits) ;
+    wxBitmap bmp( bits ) ;

     CopyFromBitmap( bmp ) ;
 }
 
     CopyFromBitmap( bmp ) ;
 }
 

-wxIcon::wxIcon( char **bits ) 
+wxIcon::wxIcon( char **bits )

 {
 {

-    wxBitmap bmp(bits) ;
+    wxBitmap bmp( bits ) ;

     CopyFromBitmap( bmp ) ;
 }
 
     CopyFromBitmap( bmp ) ;
 }
 

-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 );
+}
+
+wxIcon::wxIcon(WXHICON icon, const wxSize& size)
+      : wxGDIObject()
+{
+    // as the icon owns that ref, we have to acquire it as well
+    if (icon)
+        AcquireIconRef( (IconRef) icon ) ;
+
+    m_refData = new wxIconRefData( icon, size.x, size.y ) ;

 }
 
 wxIcon::~wxIcon()
 {
 }
 
 }
 
 wxIcon::~wxIcon()
 {
 }
 

-WXHICON wxIcon::GetHICON() const 
+WXHICON wxIcon::GetHICON() const

 {
     wxASSERT( Ok() ) ;
 {
     wxASSERT( Ok() ) ;

+

     return (WXHICON) ((wxIconRefData*)m_refData)->GetHICON() ;
 }
 
     return (WXHICON) ((wxIconRefData*)m_refData)->GetHICON() ;
 }
 


@@ -83,35 +138,38 @@ int wxIcon::GetHeight() const
    return M_ICONDATA->GetHeight();
 }
 
    return M_ICONDATA->GetHeight();
 }
 

-int wxIcon::GetDepth() const{
-       return 32; 
+int wxIcon::GetDepth() const
+{
+    return 32;

 }
 
 }
 

-void wxIcon::SetDepth(int depth){
-       
+void wxIcon::SetDepth( int WXUNUSED(depth) )
+{

 }
 
 }
 

-void wxIcon::SetWidth(int width){
-       
+void wxIcon::SetWidth( int WXUNUSED(width) )
+{

 }
 
 }
 

-void wxIcon::SetHeight(int height){
-       
+void wxIcon::SetHeight( int WXUNUSED(height) )
+{

 }
 
 }
 

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

 {
     return m_refData != NULL ;
 }
 
 {
     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 )

 {
     UnRef();
 {
     UnRef();

-    
+

     if ( type == wxBITMAP_TYPE_ICON_RESOURCE )
     {
         OSType theId = 0 ;
     if ( type == wxBITMAP_TYPE_ICON_RESOURCE )
     {
         OSType theId = 0 ;

+

         if ( filename == wxT("wxICON_INFORMATION") )
         {
             theId = kAlertNoteIcon ;
         if ( filename == wxT("wxICON_INFORMATION") )
         {
             theId = kAlertNoteIcon ;


@@ -128,51 +186,85 @@ bool wxIcon::LoadFile(const wxString& filename, wxBitmapType type,
         {
             theId = kAlertStopIcon ;
         }
         {
             theId = kAlertStopIcon ;
         }

+        else if ( filename == wxT("wxICON_FOLDER") )
+        {
+            theId = kGenericFolderIcon ;
+        }
+        else if ( filename == wxT("wxICON_FOLDER_OPEN") )
+        {
+            theId = kOpenFolderIcon ;
+        }
+        else if ( filename == wxT("wxICON_NORMAL_FILE") )
+        {
+            theId = kGenericDocumentIcon ;
+        }

         else
         else

-        {/*
-            Str255 theName ;
-            OSType theType ;
-            wxMacStringToPascal( name , theName ) ;
-            
-            Handle resHandle = GetNamedResource( 'cicn' , theName ) ;
-            if ( resHandle != 0L )
+        {
+               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 ) ;
+                       }
+                       }
+            if ( iconRef == NULL )

             {
             {

-                GetResInfo( resHandle , &theId , &theType , theName ) ;
-                ReleaseResource( resHandle ) ;
+                // TODO add other attempts to load it from files etc here

             }
             }

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

         }
         }

+

         if ( theId != 0 )
         {
             IconRef iconRef = NULL ;
         if ( theId != 0 )
         {
             IconRef iconRef = NULL ;

-            verify_noerr(GetIconRef(kOnSystemDisk,kSystemIconsCreator,theId, &iconRef)) ;    
+            verify_noerr( GetIconRef( kOnSystemDisk, kSystemIconsCreator, theId, &iconRef ) ) ;

             if ( iconRef )
             {
             if ( iconRef )
             {

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

             }
         }
             }
         }

-        return FALSE ;
+
+        return false ;

     }
     else
     {
     }
     else
     {

-        wxBitmapHandler *handler = wxBitmap::FindHandler(type);
+        wxBitmapHandler *handler = wxBitmap::FindHandler( type );

 
         if ( handler )
         {
             wxBitmap bmp ;
 
         if ( handler )
         {
             wxBitmap bmp ;

-            if ( handler->LoadFile(&bmp , filename, type, desiredWidth, desiredHeight ))
+            if ( handler->LoadFile( &bmp , filename, type, desiredWidth, desiredHeight ))

             {
                 CopyFromBitmap( bmp ) ;
             {
                 CopyFromBitmap( bmp ) ;

+

                 return true ;
             }
                 return true ;
             }

+

             return false ;
         }
         else
         {
 #if wxUSE_IMAGE
             return false ;
         }
         else
         {
 #if wxUSE_IMAGE

-            wxImage loadimage(filename, type);
-            if (loadimage.Ok()) 
+            wxImage loadimage( filename, type );
+            if (loadimage.Ok())

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


@@ -180,8 +272,10 @@ bool wxIcon::LoadFile(const wxString& filename, wxBitmapType type,
                     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 ) ;

+

                 return true;
             }
 #endif
                 return true;
             }
 #endif


@@ -190,47 +284,25 @@ bool wxIcon::LoadFile(const wxString& filename, wxBitmapType type,
     return true ;
 }
 
     return true ;
 }
 

-void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
+void wxIcon::CopyFromBitmap( const wxBitmap& bmp )

 {
     UnRef() ;
 {
     UnRef() ;

-    
-    // as the bitmap owns that ref, we have to acquire it as well
-    IconRef iconRef = bmp.GetBitmapData()->GetIconRef() ;
-    AcquireIconRef( iconRef ) ;
-    m_refData = new wxIconRefData( (WXHICON) iconRef ) ;
-    M_ICONDATA->SetWidth( bmp.GetWidth() ) ;
-    M_ICONDATA->SetHeight( bmp.GetHeight() ) ;
-}
-
-wxIconRefData::wxIconRefData( WXHICON icon )
-{
-    m_iconRef = MAC_WXHICON( icon ) ;
-    // Std sizes
-    SetWidth( 32 ) ;
-    SetHeight( 32 ) ;
-}

 
 

-void wxIconRefData::Init() 
-{
-    m_iconRef = NULL ;
-}
-
-void wxIconRefData::Free()
-{
-    if ( m_iconRef )
-    {
-        ReleaseIconRef( m_iconRef ) ;
-        m_iconRef = NULL ;
-    }
+    // as the bitmap owns that ref, we have to acquire it as well
+    IconRef iconRef = bmp.CreateIconRef() ;
+    m_refData = new wxIconRefData( (WXHICON) iconRef, bmp.GetWidth(), bmp.GetHeight()  ) ;

 }
 
 IMPLEMENT_DYNAMIC_CLASS(wxICONResourceHandler, wxBitmapHandler)
 
 }
 
 IMPLEMENT_DYNAMIC_CLASS(wxICONResourceHandler, wxBitmapHandler)
 

-bool  wxICONResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
-                                      int desiredWidth, int desiredHeight)
+bool  wxICONResourceHandler::LoadFile(
+    wxBitmap *bitmap, const wxString& name, long WXUNUSED(flags),
+    int desiredWidth, int desiredHeight )

 {
     wxIcon icon ;
     icon.LoadFile( name , wxBITMAP_TYPE_ICON_RESOURCE , desiredWidth , desiredHeight ) ;
     bitmap->CopyFromIcon( icon ) ;
 {
     wxIcon icon ;
     icon.LoadFile( name , wxBITMAP_TYPE_ICON_RESOURCE , desiredWidth , desiredHeight ) ;
     bitmap->CopyFromIcon( icon ) ;

+

     return bitmap->Ok() ;
 }
     return bitmap->Ok() ;
 }

+