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

corrections for Mac OS X after wxUniv merge

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Gilles Depeyrot
2001-06-30 10:14:48 +00:00
parent cdad5e204b
commit b698c8e9bf
11 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/mac/carbon/bitmap.cpp
View File

@@ -10,13 +10,12 @@
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
#pragma implementation "bitmapbase.h"
#pragma implementation "bitmap.h"
#endif
#include "wx/wx.h"
#include "wx/setup.h"
#include "wx/utils.h"
#include "wx/palette.h"
#include "wx/defs.h"
#include "wx/bitmap.h"
#include "wx/icon.h"
#include "wx/log.h"
@@ -241,7 +240,7 @@ wxBitmapRefData::~wxBitmapRefData()
}
}
wxList wxBitmap::sm_handlers;
wxList wxBitmapBase::sm_handlers;
bool wxBitmap::CopyFromIcon(const wxIcon& icon)