X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/430ff602284deeeca03259b9b21d53d26c4a64a9..324eeecb3cdc9522e136af6670443148772b412a:/include/wx/rawbmp.h

diff --git a/include/wx/rawbmp.h b/include/wx/rawbmp.h
index 8a347433b3..0815f09f17 100644
--- a/include/wx/rawbmp.h
+++ b/include/wx/rawbmp.h
@@ -5,13 +5,15 @@
 // Modified by:
 // Created:     10.03.03
 // RCS-ID:      $Id$
-// Copyright:   (c) 2002 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2002 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_RAWBMP_H_BASE_
 #define _WX_RAWBMP_H_BASE_
 
+#include "wx/image.h"
+
 // ----------------------------------------------------------------------------
 // Abstract Pixel API
 //
@@ -154,6 +156,16 @@ typedef wxPixelFormat<unsigned char, 24, 0, 1, 2> wxImagePixelFormat;
     typedef wxPixelFormat<unsigned char, 32, 1, 2, 3> wxNativePixelFormat;
 
     #define wxPIXEL_FORMAT_ALPHA 0
+#elif defined(__WXCOCOA__)
+    // Cocoa is standard RGB or RGBA (normally it is RGBA)
+    typedef wxPixelFormat<unsigned char, 24, 0, 1, 2> wxNativePixelFormat;
+
+    #define wxPIXEL_FORMAT_ALPHA 3
+#elif defined(__WXGTK__)
+    // Under GTK+ 2.X we use GdkPixbuf, which should be RGBA
+    typedef wxPixelFormat<unsigned char, 24, 0, 1, 2> wxNativePixelFormat;
+
+    #define wxPIXEL_FORMAT_ALPHA 3
 #endif
 
 // the (most common) native format for bitmaps with alpha channel
@@ -169,6 +181,7 @@ typedef wxPixelFormat<unsigned char, 24, 0, 1, 2> wxImagePixelFormat;
 // used as default value for the pixel format in wxPixelIterator template
 template <class T> struct wxPixelFormatFor;
 
+#if wxUSE_IMAGE
 // wxPixelFormatFor is only defined for wxImage, attempt to use it with other
 // classes (wxBitmap...) will result in compile errors which is exactly what we
 // want
@@ -177,6 +190,7 @@ struct WXDLLEXPORT wxPixelFormatFor<wxImage>
 {
     typedef wxImagePixelFormat Format;
 };
+#endif //wxUSE_IMAGE
 
 // ----------------------------------------------------------------------------
 // wxPixelData
@@ -264,6 +278,7 @@ struct WXDLLEXPORT wxPixelDataOut
     };
 };
 
+#if wxUSE_IMAGE
 // wxPixelData specialization for wxImage: this is the simplest case as we
 // don't have to care about different pixel formats here
 template <>
@@ -383,9 +398,9 @@ struct WXDLLEXPORT wxPixelDataOut<wxImage>
             // -----------
 
             // access to invidividual colour components
-            ChannelType& Red() { return m_ptr[PixelFormat::RED]; }
-            ChannelType& Green() { return m_ptr[PixelFormat::GREEN]; }
-            ChannelType& Blue() { return m_ptr[PixelFormat::BLUE]; }
+            ChannelType& Red() { return m_pRGB[PixelFormat::RED]; }
+            ChannelType& Green() { return m_pRGB[PixelFormat::GREEN]; }
+            ChannelType& Blue() { return m_pRGB[PixelFormat::BLUE]; }
             ChannelType& Alpha() { return *m_pAlpha; }
 
         // private: -- see comment in the beginning of the file
@@ -421,7 +436,7 @@ struct WXDLLEXPORT wxPixelDataOut<wxImage>
         {
             m_stride = Iterator::SizePixel * m_width;
 
-            InitRect(rect.GetPositions(), rect.GetSize());
+            InitRect(rect.GetPosition(), rect.GetSize());
         }
 
         // we evaluate to true only if we could get access to bitmap data
@@ -448,7 +463,9 @@ struct WXDLLEXPORT wxPixelDataOut<wxImage>
         Iterator m_pixels;
     };
 };
+#endif //wxUSE_IMAGE
 
+#if wxUSE_GUI
 // wxPixelData specialization for wxBitmap: here things are more interesting as
 // we also have to support different pixel formats
 template <>
@@ -461,7 +478,7 @@ struct WXDLLEXPORT wxPixelDataOut<wxBitmap>
         // the type of the class we're working with
         typedef wxBitmap ImageType;
 
-        class Iterator
+        class WXDLLEXPORT Iterator
         {
         public:
             // the pixel format we use
@@ -630,6 +647,7 @@ struct WXDLLEXPORT wxPixelDataOut<wxBitmap>
         }
     };
 };
+#endif //wxUSE_GUI
 
 #ifdef __VISUALC__
     // typedef-name 'foo' used as synonym for class-name 'bar'
@@ -660,9 +678,13 @@ public:
 
 
 // some "predefined" pixel data classes
+#if wxUSE_IMAGE
 typedef wxPixelData<wxImage> wxImagePixelData;
+#endif //wxUSE_IMAGE
+#if wxUSE_GUI
 typedef wxPixelData<wxBitmap, wxNativePixelFormat> wxNativePixelData;
 typedef wxPixelData<wxBitmap, wxAlphaPixelFormat> wxAlphaPixelData;
+#endif //wxUSE_GUI
 
 // ----------------------------------------------------------------------------
 // wxPixelIterator