post wxUniv merge fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10719 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-29 16:19:53 +00:00
parent bf7b3e2b9d
commit 90b959aee4
30 changed files with 186 additions and 429 deletions
--- a/src/mac/icon.cpp
+++ b/src/mac/icon.cpp
@@ -61,7 +61,7 @@ bool wxIcon::LoadFile(const wxString& filename, long type,

  m_refData = new wxBitmapRefData;

-  wxBitmapHandler *handler = FindHandler(type);
+  wxBitmapHandler *handler = FindHandler((wxBitmapType)type);

  if ( handler )
 	return handler->LoadFile(this, filename, type, desiredWidth, desiredHeight);