#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 ) ;
+}
+
+void wxIconRefData::Init()
+{
+ m_iconRef = NULL ;
+}
+
+void wxIconRefData::Free()
+{
+ if ( m_iconRef )
+ {
+ ReleaseIconRef( m_iconRef ) ;
+ m_iconRef = NULL ;
+ }
+}
+
+//
+//
+//
wxIcon::wxIcon()
{
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()
{
}
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 ;
}
{
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
{
-#if 0
- 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
}
-#endif
+ if ( iconRef )
+ {
+ m_refData = new wxIconRefData( (WXHICON) iconRef, desiredWidth, desiredHeight ) ;
+ return true ;
+ }
}
if ( theId != 0 )
verify_noerr( GetIconRef( kOnSystemDisk, kSystemIconsCreator, theId, &iconRef ) ) ;
if ( iconRef )
{
- m_refData = new wxIconRefData( (WXHICON) iconRef ) ;
+ m_refData = new wxIconRefData( (WXHICON) iconRef, desiredWidth, desiredHeight ) ;
return true ;
}
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 ) ;
-
- // Standard sizes
- SetWidth( 32 ) ;
- SetHeight( 32 ) ;
-}
-
-void wxIconRefData::Init()
-{
- m_iconRef = NULL ;
-}
-
-void wxIconRefData::Free()
-{
- if ( m_iconRef )
- {
- ReleaseIconRef( m_iconRef ) ;
- m_iconRef = NULL ;
- }
+ IconRef iconRef = bmp.CreateIconRef() ;
+ m_refData = new wxIconRefData( (WXHICON) iconRef, bmp.GetWidth(), bmp.GetHeight() ) ;
}
IMPLEMENT_DYNAMIC_CLASS(wxICONResourceHandler, wxBitmapHandler)
bool wxICONResourceHandler::LoadFile(
- wxBitmap *bitmap, const wxString& name, long flags,
+ wxBitmap *bitmap, const wxString& name, long WXUNUSED(flags),
int desiredWidth, int desiredHeight )
{
wxIcon icon ;