use wxWindow::GetClientSize() instead of ::GetClientRect() in wxActiveXContainer...

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

diff --git a/src/osx/carbon/icon.cpp b/src/osx/carbon/icon.cpp
index 38e86abec3fa15e63699136514e305060eb91784..ddd2dd43dc0dd9983d095b6852efe2996b2e9984 100644 (file)
--- a/src/osx/carbon/icon.cpp
+++ b/src/osx/carbon/icon.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        src/mac/carbon/icon.cpp
+// Name:        src/osx/carbon/icon.cpp

 // Purpose:     wxIcon class
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxIcon class
 // Author:      Stefan Csomor
 // Modified by:


@@ -53,7 +53,7 @@ private:
 
 wxIconRefData::wxIconRefData( WXHICON icon, int desiredWidth, int desiredHeight )
 {
 
 wxIconRefData::wxIconRefData( WXHICON icon, int desiredWidth, int desiredHeight )
 {

-    m_iconRef = MAC_WXHICON( icon ) ;
+    m_iconRef = (IconRef)( icon ) ;

 
     // Standard sizes
     SetWidth( desiredWidth == -1 ? 32 : desiredWidth ) ;
 
     // Standard sizes
     SetWidth( desiredWidth == -1 ? 32 : desiredWidth ) ;


@@ -97,10 +97,10 @@ wxIcon::wxIcon(const char* const* bits)
 }
 
 wxIcon::wxIcon(
 }
 
 wxIcon::wxIcon(

-    const wxString& icon_file, int flags,
+    const wxString& icon_file, wxBitmapType flags,

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

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

 }
 
 wxIcon::wxIcon(WXHICON icon, const wxSize& size)
 }
 
 wxIcon::wxIcon(WXHICON icon, const wxSize& size)


@@ -124,7 +124,7 @@ wxGDIRefData *wxIcon::CreateGDIRefData() const
 
 wxGDIRefData *wxIcon::CloneGDIRefData(const wxGDIRefData *data) const
 {
 
 wxGDIRefData *wxIcon::CloneGDIRefData(const wxGDIRefData *data) const
 {

-    return new wxIconRefData(*wx_static_cast(const wxIconRefData *, data));
+    return new wxIconRefData(*static_cast<const wxIconRefData *>(data));

 }
 
 WXHICON wxIcon::GetHICON() const
 }
 
 WXHICON wxIcon::GetHICON() const


@@ -305,7 +305,7 @@ void wxIcon::CopyFromBitmap( const wxBitmap& bmp )
 IMPLEMENT_DYNAMIC_CLASS(wxICONResourceHandler, wxBitmapHandler)
 
 bool  wxICONResourceHandler::LoadFile(
 IMPLEMENT_DYNAMIC_CLASS(wxICONResourceHandler, wxBitmapHandler)
 
 bool  wxICONResourceHandler::LoadFile(

-    wxBitmap *bitmap, const wxString& name, long WXUNUSED(flags),
+    wxBitmap *bitmap, const wxString& name, wxBitmapType WXUNUSED(flags),

     int desiredWidth, int desiredHeight )
 {
     wxIcon icon ;
     int desiredWidth, int desiredHeight )
 {
     wxIcon icon ;