reorganized wxBitmap/wxBitmapHandler classes to use wxBitmapType instead of "long" where possible; made them const-correct; introduce wxBITMAP_SCREEN_DEPTH instead of -1 for clearness (specially in the docs); remove wxBitmapHandler empty stubs and rename wxBitmapHandlerBase as wxBitmapHandler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52820 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -72,12 +72,12 @@ wxIcon::wxIcon(const char bits[], int width, int height)
|
||||
}
|
||||
|
||||
wxIcon::wxIcon(const wxString& iconfile,
|
||||
long flags,
|
||||
wxBitmapType type,
|
||||
int desiredWidth,
|
||||
int desiredHeight)
|
||||
|
||||
{
|
||||
LoadFile(iconfile, flags, desiredWidth, desiredHeight);
|
||||
LoadFile(iconfile, type, desiredWidth, desiredHeight);
|
||||
}
|
||||
|
||||
wxIcon::wxIcon(const wxIconLocation& loc)
|
||||
@@ -135,7 +135,7 @@ void wxIcon::CreateIconFromXpm(const char* const* data)
|
||||
}
|
||||
|
||||
bool wxIcon::LoadFile(const wxString& filename,
|
||||
long type,
|
||||
wxBitmapType type,
|
||||
int desiredWidth, int desiredHeight)
|
||||
{
|
||||
UnRef();
|
||||
|
Reference in New Issue
Block a user