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

fix virtual function hiding for LoadFile(); replace a few more longs with wxBitmapTypes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56883 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-11-21 16:17:16 +00:00
parent 101872998b
commit f1ca421b41
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/wx/osx/carbon/icon.h
View File

@@ -22,7 +22,7 @@ public:
wxIcon(const char* const* data); wxIcon(const char* const* data);
wxIcon(const char bits[], int width , int height ); wxIcon(const char bits[], int width , int height );
wxIcon(const wxString& name, int flags = wxICON_DEFAULT_TYPE, wxIcon(const wxString& name, wxBitmapType flags = wxICON_DEFAULT_TYPE,
int desiredWidth = -1, int desiredHeight = -1); int desiredWidth = -1, int desiredHeight = -1);
wxIcon(const wxIconLocation& loc) wxIcon(const wxIconLocation& loc)
{ {
@@ -88,9 +88,16 @@ public:
SetType(wxBITMAP_TYPE_ICON_RESOURCE); SetType(wxBITMAP_TYPE_ICON_RESOURCE);
}; };
virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags, virtual bool LoadFile(wxBitmap *bitmap,
int desiredWidth = -1, int desiredHeight = -1); const wxString& name,
wxBitmapType flags,
int desiredWidth = -1,
int desiredHeight = -1);
// unhide the base class virtual
virtual bool LoadFile(wxBitmap *bitmap,
const wxString& name,
wxBitmapType flags)
{ return LoadFile(bitmap, name, flags, -1, -1); }
}; };
#endif #endif

6
src/osx/carbon/icon.cpp
View File

@@ -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)
@@ -305,7 +305,7 @@ void wxIcon::CopyFromBitmap( const wxBitmap& bmp )
IMPLEMENT_DYNAMIC_CLASS(wxICONResourceHandler, wxBitmapHandler) IMPLEMENT_DYNAMIC_CLASS(wxICONResourceHandler, wxBitmapHandler)
bool wxICONResourceHandler::LoadFile( bool wxICONResourceHandler::LoadFile(
wxBitmap *bitmap, const wxString& name, long WXUNUSED(flags), wxBitmap *bitmap, const wxString& name, wxBitmapType WXUNUSED(flags),
int desiredWidth, int desiredHeight ) int desiredWidth, int desiredHeight )
{ {
wxIcon icon ; wxIcon icon ;