correcting condition: only interfere in the non-native case

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

diff --git a/src/mac/carbon/icon.cpp b/src/mac/carbon/icon.cpp
index 26cb83e93c2182f4317d757d7aa06d64f01e1b5f..956d8f72c3f992f338b6c0bb0ae3c20b1fd1a150 100644 (file)
--- a/src/mac/carbon/icon.cpp
+++ b/src/mac/carbon/icon.cpp
@@ -1,23 +1,29 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        icon.cpp
 // Purpose:     wxIcon class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        icon.cpp
 // Purpose:     wxIcon class

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:       wxWindows licence

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

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "icon.h"
 #endif
 
 #pragma implementation "icon.h"
 #endif
 

+#include "wx/wxprec.h"
+

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

-#if !USE_SHARED_LIBRARIES

 IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
 IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)

-#endif
+
+#include "wx/image.h"
+#include "wx/mac/private.h"
+
+#define M_ICONDATA ((wxIconRefData *)m_refData)
+

 
 /*
  * Icons
 
 /*
  * Icons


@@ -27,104 +33,202 @@ wxIcon::wxIcon()
 {
 }
 
 {
 }
 

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

 {
 {

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

 }
 
 }
 

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

 {
 {

+    wxBitmap bmp(bits) ;
+    CopyFromBitmap( bmp ) ;

 }
 
 }
 

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

 {
 {

+    wxBitmap bmp(bits) ;
+    CopyFromBitmap( bmp ) ;

 }
 
 }
 

-wxIcon::wxIcon(const wxString& icon_file, long flags,
+wxIcon::wxIcon(const wxString& icon_file, int flags,

     int desiredWidth, int desiredHeight)
     int desiredWidth, int desiredHeight)

-

 {
 {

-    LoadFile(icon_file, flags, desiredWidth, desiredHeight);
+    LoadFile(icon_file, (wxBitmapType) flags, desiredWidth, desiredHeight);

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

-bool wxIcon::LoadFile(const wxString& filename, long type,
-    int desiredWidth, int desiredHeight)
+WXHICON wxIcon::GetHICON() const 
+{
+    wxASSERT( Ok() ) ;
+    return (WXHICON) ((wxIconRefData*)m_refData)->GetHICON() ;
+}
+
+int wxIcon::GetWidth() const
+{
+   wxCHECK_MSG( Ok(), -1, wxT("invalid icon") );
+
+   return M_ICONDATA->GetWidth();
+}
+
+int wxIcon::GetHeight() const

 {
 {

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

 
 

-  m_refData = new wxBitmapRefData;
+   return M_ICONDATA->GetHeight();
+}

 
 

-  wxBitmapHandler *handler = FindHandler((wxBitmapType)type);
+int wxIcon::GetDepth() const{
+       return 32; 
+}

 
 

-  if ( handler )
-       return handler->LoadFile(this, filename, type, desiredWidth, desiredHeight);
-  else
-       return FALSE;
+void wxIcon::SetDepth(int depth){
+       

 }
 
 }
 

-IMPLEMENT_DYNAMIC_CLASS(wxICONResourceHandler, wxBitmapHandler)
+void wxIcon::SetWidth(int width){
+       
+}

 
 

-bool  wxICONResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
-          int desiredWidth, int desiredHeight)
+void wxIcon::SetHeight(int height){
+       
+}
+
+bool wxIcon::Ok() const

 {
 {

-       short theId = -1 ;
-    if ( name == "wxICON_INFO" )
-    {
-        theId = kNoteIcon ;
-    }
-    else if ( name == "wxICON_QUESTION" )
+    return m_refData != NULL ;
+}
+
+bool wxIcon::LoadFile(const wxString& filename, wxBitmapType type,
+    int desiredWidth, int desiredHeight)
+{
+    UnRef();
+    
+    if ( type == wxBITMAP_TYPE_ICON_RESOURCE )

     {
     {

-        theId = kCautionIcon ;
+        OSType theId = 0 ;
+        if ( filename == wxT("wxICON_INFORMATION") )
+        {
+            theId = kAlertNoteIcon ;
+        }
+        else if ( filename == wxT("wxICON_QUESTION") )
+        {
+            theId = kAlertCautionIcon ;
+        }
+        else if ( filename == wxT("wxICON_WARNING") )
+        {
+            theId = kAlertCautionIcon ;
+        }
+        else if ( filename == wxT("wxICON_ERROR") )
+        {
+            theId = kAlertStopIcon ;
+        }
+        else
+        {/*
+            Str255 theName ;
+            OSType theType ;
+            wxMacStringToPascal( name , theName ) ;
+            
+            Handle resHandle = GetNamedResource( 'cicn' , theName ) ;
+            if ( resHandle != 0L )
+            {
+                GetResInfo( resHandle , &theId , &theType , theName ) ;
+                ReleaseResource( resHandle ) ;
+            }
+        */
+        }
+        if ( theId != 0 )
+        {
+            IconRef iconRef = NULL ;
+            verify_noerr(GetIconRef(kOnSystemDisk,kSystemIconsCreator,theId, &iconRef)) ;    
+            if ( iconRef )
+            {
+                m_refData = new wxIconRefData( (WXHICON) iconRef ) ;
+                return TRUE ;
+            }
+        }
+        return FALSE ;

     }
     }

-    else if ( name == "wxICON_WARNING" )
-    {
-         theId = kCautionIcon ;
-   }
-    else if ( name == "wxICON_ERROR" )
+    else

     {
     {

-        theId = kStopIcon ;
+        wxBitmapHandler *handler = wxBitmap::FindHandler(type);
+
+        if ( handler )
+        {
+            wxBitmap bmp ;
+            if ( handler->LoadFile(&bmp , filename, type, desiredWidth, desiredHeight ))
+            {
+                CopyFromBitmap( bmp ) ;
+                return true ;
+            }
+            return false ;
+        }
+        else
+        {
+#if wxUSE_IMAGE
+            wxImage loadimage(filename, type);
+            if (loadimage.Ok()) 
+            {
+                if ( desiredWidth == -1 )
+                    desiredWidth = loadimage.GetWidth() ;
+                if ( desiredHeight == -1 )
+                    desiredHeight = loadimage.GetHeight() ;
+                if ( desiredWidth != loadimage.GetWidth() || desiredHeight != loadimage.GetHeight() )
+                    loadimage.Rescale( desiredWidth , desiredHeight ) ;
+                wxBitmap bmp( loadimage );
+                CopyFromBitmap( bmp ) ;
+                return true;
+            }
+#endif
+        }

     }
     }

-    else
+    return true ;
+}
+
+void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
+{
+    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 )

     {
     {

-       Str255 theName ;
-       OSType theType ;
-
-    #if TARGET_CARBON
-       c2pstrcpy( (StringPtr) theName , name ) ;
-    #else
-       strcpy( (char *) theName , name ) ;
-       c2pstr( (char *) theName ) ;
-    #endif
-       
-       Handle resHandle = GetNamedResource( 'cicn' , theName ) ;
-       if ( resHandle != 0L )
-       {
-               GetResInfo( resHandle , &theId , &theType , theName ) ;
-               ReleaseResource( resHandle ) ;
-       }
+        ReleaseIconRef( m_iconRef ) ;
+        m_iconRef = NULL ;

     }
     }

-       if ( theId != -1 )
-       {
-               CIconHandle theIcon = (CIconHandle ) GetCIcon( theId ) ;
-               if ( theIcon )
-               {
-                       M_BITMAPHANDLERDATA->m_hIcon = theIcon ;
-                       M_BITMAPHANDLERDATA->m_width =  32 ;
-                       M_BITMAPHANDLERDATA->m_height = 32 ;
-                       
-                       M_BITMAPHANDLERDATA->m_depth = 8 ;
-                       M_BITMAPHANDLERDATA->m_ok = true ;
-                       M_BITMAPHANDLERDATA->m_numColors = 256 ;
-                       M_BITMAPHANDLERDATA->m_bitmapType = kMacBitmapTypeIcon ;
-                       return TRUE ;
-               }
-       }
-       return FALSE ;
+}
+
+IMPLEMENT_DYNAMIC_CLASS(wxICONResourceHandler, wxBitmapHandler)
+
+bool  wxICONResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
+                                      int desiredWidth, int desiredHeight)
+{
+    wxIcon icon ;
+    icon.LoadFile( name , wxBITMAP_TYPE_ICON_RESOURCE , desiredWidth , desiredHeight ) ;
+    bitmap->CopyFromIcon( icon ) ;
+    return bitmap->Ok() ;

 }
 }