Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

icon - bitmap conversions corrections (size is not always the 'standard' 32 pixels)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32059 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2005-02-15 06:05:52 +00:00
parent b610b1db09
commit ea68b70605
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/mac/carbon/icon.cpp
View File

@@ -24,6 +24,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
#include "wx/image.h" #include "wx/image.h"
#include "wx/mac/private.h" #include "wx/mac/private.h"
#define M_ICONDATA ((wxIconRefData *)m_refData)
/* /*
* Icons * Icons
@@ -69,12 +71,16 @@ WXHICON wxIcon::GetHICON() const
int wxIcon::GetWidth() const int wxIcon::GetWidth() const
{ {
return 32 ; wxCHECK_MSG( Ok(), -1, wxT("invalid icon") );
return M_ICONDATA->GetWidth();
} }
int wxIcon::GetHeight() const int wxIcon::GetHeight() const
{ {
return 32 ; wxCHECK_MSG( Ok(), -1, wxT("invalid icon") );
return M_ICONDATA->GetHeight();
} }
bool wxIcon::Ok() const bool wxIcon::Ok() const
@@ -171,11 +177,16 @@ void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
UnRef() ; UnRef() ;
m_refData = new wxIconRefData( (WXHICON) wxMacCreateIconRef( bmp ) ) ; m_refData = new wxIconRefData( (WXHICON) wxMacCreateIconRef( bmp ) ) ;
M_ICONDATA->SetWidth( bmp.GetWidth() ) ;
M_ICONDATA->SetHeight( bmp.GetHeight() ) ;
} }
wxIconRefData::wxIconRefData( WXHICON icon ) wxIconRefData::wxIconRefData( WXHICON icon )
{ {
m_iconRef = MAC_WXHICON( icon ) ; m_iconRef = MAC_WXHICON( icon ) ;
// Std sizes
SetWidth( 32 ) ;
SetHeight( 32 ) ;
} }
void wxIconRefData::Init() void wxIconRefData::Init()