solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

better fix for aCC and rawbmp.h

Browse source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59031 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett 2009-02-19 17:28:37 +00:00
parent 04b2ab1a0c
commit ce7c8a9751
3 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/wx/features.h
View file

@ -87,7 +87,11 @@
/* Direct access to bitmap data is not implemented in all ports yet */
#if defined(__WXGTK20__) || defined(__WXMAC__) || defined(__WXDFB__) || \
(defined(__WXMSW__) && !defined(__WATCOMC__))
#define wxHAS_RAW_BITMAP
// HP aCC for PA-RISC can't compile rawbmp.h
#if !defined(__HP_aCC) || !defined(__hppa)
#define wxHAS_RAW_BITMAP
#endif
#endif
/* also define deprecated synonym which exists for compatibility only */

5
include/wx/rawbmp.h
View file

@ -12,6 +12,10 @@
#ifndef _WX_RAWBMP_H_
#define _WX_RAWBMP_H_
#include "wx/defs.h"
#ifdef wxHAS_RAW_BITMAP
#include "wx/image.h"
#include "wx/bitmap.h"
@ -749,4 +753,5 @@ struct wxPixelIterator : public wxPixelData<Image, PixelFormat>::Iterator
{
};
#endif // wxHAS_RAW_BITMAP
#endif // _WX_RAWBMP_H_

9
src/gtk/bitmap.cpp
View file

@ -21,10 +21,7 @@
#include "wx/colour.h"
#endif
// HP aCC for PA-RISC can't compile rawbmp.h
#if !defined(__HP_aCC) || !defined(__hppa)
#include "wx/rawbmp.h"
#endif
#include "wx/rawbmp.h"
#include "wx/gtk/private/object.h"
@ -859,7 +856,7 @@ void wxBitmap::PurgeOtherRepresentations(wxBitmap::Representation keep)
}
}
#if !defined(__HP_aCC) || !defined(__hppa)
#ifdef wxHAS_RAW_BITMAP
void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
{
void* bits = NULL;
@ -880,7 +877,7 @@ void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
void wxBitmap::UngetRawData(wxPixelDataBase& WXUNUSED(data))
{
}
#endif
#endif // wxHAS_RAW_BITMAP
bool wxBitmap::HasAlpha() const
{