X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/62f864c32c53356b7228591c85b14abc491c46f0..b4446c244775324631b8dd2b588ea35f32e71728:/src/mac/classic/icon.cpp?ds=sidebyside diff --git a/src/mac/classic/icon.cpp b/src/mac/classic/icon.cpp index 1c32358a38..b62c94d043 100644 --- a/src/mac/classic/icon.cpp +++ b/src/mac/classic/icon.cpp @@ -1,17 +1,15 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: icon.cpp +// Name: src/mac/classic/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 ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "icon.h" -#endif +#include "wx/wxprec.h" #include "wx/icon.h" @@ -28,10 +26,9 @@ 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(bits, width, height) { - } wxIcon::wxIcon( const char **bits ) : @@ -58,15 +55,15 @@ bool wxIcon::LoadFile(const wxString& filename, wxBitmapType type, int desiredWidth, int desiredHeight) { UnRef(); - + m_refData = new wxBitmapRefData; - + wxBitmapHandler *handler = FindHandler((wxBitmapType)type); - + if ( handler ) return handler->LoadFile(this, filename, type, desiredWidth, desiredHeight); else - return FALSE; + return false; } void wxIcon::CopyFromBitmap(const wxBitmap& bmp) @@ -102,7 +99,7 @@ bool wxICONResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, lo Str255 theName ; OSType theType ; wxMacStringToPascal( name , theName ) ; - + Handle resHandle = GetNamedResource( 'cicn' , theName ) ; if ( resHandle != 0L ) { @@ -118,13 +115,13 @@ bool wxICONResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, lo 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 true; } } - return FALSE ; + return false; }