/////////////////////////////////////////////////////////////////////////////
-// 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
-// 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"
-#if !USE_SHARED_LIBRARIES
-IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
+#ifndef WX_PRECOMP
+ #include "wx/image.h"
#endif
-#include "wx/image.h"
#include "wx/mac/private.h"
-#define M_ICONDATA ((wxIconRefData *)m_refData)
+IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
+#define M_ICONDATA ((wxIconRefData *)m_refData)
-/*
- * Icons
- */
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 ) ;
}
-wxIcon::wxIcon( const char **bits )
+wxIcon::wxIcon( const char **bits )
{
- wxBitmap bmp(bits) ;
+ wxBitmap bmp( bits ) ;
CopyFromBitmap( bmp ) ;
}
-wxIcon::wxIcon( char **bits )
+wxIcon::wxIcon( char **bits )
{
- wxBitmap bmp(bits) ;
+ wxBitmap bmp( bits ) ;
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 ) ;
+ if ( (size.x != -1) && (size.y != -1) )
+ {
+ M_ICONDATA->SetWidth( size.x ) ;
+ M_ICONDATA->SetHeight( size.y ) ;
+ }
}
wxIcon::~wxIcon()
{
}
-WXHICON wxIcon::GetHICON() const
+WXHICON wxIcon::GetHICON() const
{
wxASSERT( Ok() ) ;
+
return (WXHICON) ((wxIconRefData*)m_refData)->GetHICON() ;
}
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 ;
}
-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();
-
+
if ( type == wxBITMAP_TYPE_ICON_RESOURCE )
{
OSType theId = 0 ;
+
if ( filename == wxT("wxICON_INFORMATION") )
{
theId = kAlertNoteIcon ;
{
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
- {/*
- 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 ) ;
+ return true ;
+ }
}
+
if ( theId != 0 )
{
IconRef iconRef = NULL ;
- verify_noerr(GetIconRef(kOnSystemDisk,kSystemIconsCreator,theId, &iconRef)) ;
+ verify_noerr( GetIconRef( kOnSystemDisk, kSystemIconsCreator, theId, &iconRef ) ) ;
if ( iconRef )
{
m_refData = new wxIconRefData( (WXHICON) iconRef ) ;
- return TRUE ;
+
+ return true ;
}
}
- return FALSE ;
+
+ return false ;
}
else
{
- wxBitmapHandler *handler = wxBitmap::FindHandler(type);
+ wxBitmapHandler *handler = wxBitmap::FindHandler( type );
if ( handler )
{
wxBitmap bmp ;
- if ( handler->LoadFile(&bmp , filename, type, desiredWidth, desiredHeight ))
+ if ( handler->LoadFile( &bmp , filename, type, desiredWidth, desiredHeight ))
{
CopyFromBitmap( bmp ) ;
+
return true ;
}
+
return false ;
}
else
{
- wxImage loadimage(filename, type);
- if (loadimage.Ok())
+#if wxUSE_IMAGE
+ wxImage loadimage( filename, type );
+ if (loadimage.Ok())
{
if ( desiredWidth == -1 )
desiredWidth = loadimage.GetWidth() ;
desiredHeight = loadimage.GetHeight() ;
if ( desiredWidth != loadimage.GetWidth() || desiredHeight != loadimage.GetHeight() )
loadimage.Rescale( desiredWidth , desiredHeight ) ;
+
wxBitmap bmp( loadimage );
CopyFromBitmap( bmp ) ;
+
return true;
}
+#endif
}
}
return true ;
}
-void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
+void wxIcon::CopyFromBitmap( const wxBitmap& bmp )
{
UnRef() ;
-
- m_refData = new wxIconRefData( (WXHICON) wxMacCreateIconRef( bmp ) ) ;
+
+ // 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
+
+ // Standard sizes
SetWidth( 32 ) ;
SetHeight( 32 ) ;
}
-void wxIconRefData::Init()
+void wxIconRefData::Init()
{
m_iconRef = NULL ;
}
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 ) ;
+
return bitmap->Ok() ;
}
+
projects / wxWidgets.git / blobdiff