Added GetBitmap, GetIcon to wxImageList

[wxWidgets.git] / include / wx / rawbmp.h

diff --git a/include/wx/rawbmp.h b/include/wx/rawbmp.h
index 91a29f6f1906c2734233300d137fb8b6bff7c341..3fca5566a7156054b5439eb36142d33ef173c6a9 100644 (file)
--- a/include/wx/rawbmp.h
+++ b/include/wx/rawbmp.h
@@ -160,6 +160,11 @@ typedef wxPixelFormat<unsigned char, 24, 0, 1, 2> wxImagePixelFormat;
     // 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
 
@@ -284,6 +289,7 @@ struct WXDLLEXPORT wxPixelDataOut<wxImage>
     template <class dummyPixelFormat>
     class WXDLLEXPORT wxPixelDataIn : public wxPixelDataBase
     {
+    public:
         // the type of the class we're working with
         typedef wxImage ImageType;