projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
compilation fixed for wxDataViewCtrl: almost no class was properly exported in wxGTK...
[wxWidgets.git]
/
include
/
wx
/
rawbmp.h
diff --git
a/include/wx/rawbmp.h
b/include/wx/rawbmp.h
index db4c014d15af516d32e763bf620b5224702625df..3e599a602b287855d457b70de368a9f31d7cb957 100644
(file)
--- a/
include/wx/rawbmp.h
+++ b/
include/wx/rawbmp.h
@@
-9,8
+9,8
@@
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
-#ifndef _WX_RAWBMP_H_
BASE_
-#define _WX_RAWBMP_H_
BASE_
+#ifndef _WX_RAWBMP_H_
+#define _WX_RAWBMP_H_
#include "wx/image.h"
#include "wx/image.h"
@@
-164,9
+164,14
@@
typedef wxPixelFormat<unsigned char, 24, 0, 1, 2> wxImagePixelFormat;
#define wxPIXEL_FORMAT_ALPHA 3
#elif defined(__WXGTK__)
#define wxPIXEL_FORMAT_ALPHA 3
#elif defined(__WXGTK__)
- // Under GTK+ 2.X we use GdkPixbuf, which
should be
RGBA
+ // Under GTK+ 2.X we use GdkPixbuf, which
is standard RGB or
RGBA
typedef wxPixelFormat<unsigned char, 24, 0, 1, 2> wxNativePixelFormat;
typedef wxPixelFormat<unsigned char, 24, 0, 1, 2> wxNativePixelFormat;
+ #define wxPIXEL_FORMAT_ALPHA 3
+#elif defined(__WXDFB__)
+ // Under DirectFB, RGB components are reversed, they're in BGR order
+ typedef wxPixelFormat<unsigned char, 24, 2, 1, 0> wxNativePixelFormat;
+
#define wxPIXEL_FORMAT_ALPHA 3
#endif
#define wxPIXEL_FORMAT_ALPHA 3
#endif
@@
-520,6
+525,12
@@
struct wxPixelDataOut<wxBitmap>
bmp.GetRawData(data, PixelFormat::BitsPerPixel);
}
bmp.GetRawData(data, PixelFormat::BitsPerPixel);
}
+ // default constructor
+ Iterator()
+ {
+ m_ptr = NULL;
+ }
+
// return true if this iterator is valid
bool IsOk() const { return m_ptr != NULL; }
// return true if this iterator is valid
bool IsOk() const { return m_ptr != NULL; }
@@
-625,11
+636,22
@@
struct wxPixelDataOut<wxBitmap>
// dtor unlocks the bitmap
~wxPixelDataIn()
{
// dtor unlocks the bitmap
~wxPixelDataIn()
{
- m_bmp.UngetRawData(*this);
+ if ( m_pixels.IsOk() )
+ {
+#if defined(__WXMSW__) || defined(__WXMAC__)
+ // this is a hack to mark wxBitmap as using alpha channel
+ if ( Format::HasAlpha )
+ m_bmp.UseAlpha();
+#endif
+ m_bmp.UngetRawData(*this);
+ }
+ // else: don't call UngetRawData() if GetRawData() failed
}
}
- // call this to indicate that we should use the alpha channel
- void UseAlpha() { m_bmp.UseAlpha(); }
+#if WXWIN_COMPATIBILITY_2_8
+ // not needed anymore, calls to it should be simply removed
+ wxDEPRECATED_INLINE( void UseAlpha(), wxEMPTY_PARAMETER_VALUE )
+#endif
// private: -- see comment in the beginning of the file
// private: -- see comment in the beginning of the file
@@
-650,6
+672,7
@@
struct wxPixelDataOut<wxBitmap>
}
};
};
}
};
};
+
#endif //wxUSE_GUI
template <class Image, class PixelFormat = wxPixelFormatFor<Image> >
#endif //wxUSE_GUI
template <class Image, class PixelFormat = wxPixelFormatFor<Image> >
@@
-671,7
+694,6
@@
public:
}
};
}
};
-
// some "predefined" pixel data classes
#if wxUSE_IMAGE
typedef wxPixelData<wxImage> wxImagePixelData;
// some "predefined" pixel data classes
#if wxUSE_IMAGE
typedef wxPixelData<wxImage> wxImagePixelData;
@@
-703,5
+725,4
@@
struct wxPixelIterator : public wxPixelData<Image, PixelFormat>::Iterator
{
};
{
};
-#endif // _WX_RAWBMP_H_BASE_
-
+#endif // _WX_RAWBMP_H_