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

Remove unused global bitmap, which caused crash on startup with wxUSE_XPM==0.

Browse Source 
Use new pen style enums

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62231 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2009-10-03 16:23:18 +00:00
parent c5fe6a5bee
commit 54c5d4fa43
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/osx/core/bitmap.cpp
View File

@@ -21,8 +21,6 @@
#endif #endif
#include "wx/metafile.h" #include "wx/metafile.h"
#include "wx/xpmdecod.h"
#include "wx/rawbmp.h" #include "wx/rawbmp.h"
IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject) IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject)
@@ -67,9 +65,11 @@ public:
void Free(); void Free();
void SetOk( bool isOk) { m_ok = isOk; } void SetOk( bool isOk) { m_ok = isOk; }
#if WXWIN_COMPATIBILITY_2_8
void SetWidth( int width ) { m_width = width; } void SetWidth( int width ) { m_width = width; }
void SetHeight( int height ) { m_height = height; } void SetHeight( int height ) { m_height = height; }
void SetDepth( int depth ) { m_depth = depth; } void SetDepth( int depth ) { m_depth = depth; }
#endif
int GetWidth() const { return m_width; } int GetWidth() const { return m_width; }
int GetHeight() const { return m_height; } int GetHeight() const { return m_height; }
@@ -109,7 +109,7 @@ public:
CGContextRef GetBitmapContext() const; CGContextRef GetBitmapContext() const;
int GetBytesPerRow() const { return m_bytesPerRow; } int GetBytesPerRow() const { return m_bytesPerRow; }
private : private:
bool Create(int width , int height , int depth); bool Create(int width , int height , int depth);
void Init(); void Init();
@@ -510,10 +510,10 @@ IconRef wxBitmapRefData::GetIconRef()
{ {
// setup the header properly // setup the header properly
Handle data = NULL ; Handle data;
Handle maskdata = NULL ; Handle maskdata;
unsigned char * maskptr = NULL ; unsigned char * maskptr;
unsigned char * ptr = NULL ; unsigned char * ptr;
size_t datasize, masksize ; size_t datasize, masksize ;
datasize = sz * sz * 4 ; datasize = sz * sz * 4 ;
@@ -1403,6 +1403,7 @@ bool wxBitmap::HasAlpha() const
return M_BITMAPDATA->HasAlpha() ; return M_BITMAPDATA->HasAlpha() ;
} }
#if WXWIN_COMPATIBILITY_2_8
void wxBitmap::SetWidth(int w) void wxBitmap::SetWidth(int w)
{ {
AllocExclusive(); AllocExclusive();
@@ -1420,6 +1421,7 @@ void wxBitmap::SetDepth(int d)
AllocExclusive(); AllocExclusive();
M_BITMAPDATA->SetDepth(d); M_BITMAPDATA->SetDepth(d);
} }
#endif // WXWIN_COMPATIBILITY_2_8
void wxBitmap::SetOk(bool isOk) void wxBitmap::SetOk(bool isOk)
{ {