ComboBox for cocoa

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

diff --git a/include/wx/image.h b/include/wx/image.h
index 845de80b5b45729beb8a28579ec764928bdef77b..6fb884955b062e61ec306cf1a72bd836aafffd03 100644 (file)
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -139,6 +139,7 @@ public:
     wxImage(){}
     wxImage( int width, int height, bool clear = true );
     wxImage( int width, int height, unsigned char* data, bool static_data = false );
+    wxImage( int width, int height, unsigned char* data, unsigned char* alpha, bool static_data = false );
     wxImage( const wxString& name, long type = wxBITMAP_TYPE_ANY, int index = -1 );
     wxImage( const wxString& name, const wxString& mimetype, int index = -1 );
 
@@ -152,6 +153,7 @@ public:
 
     bool Create( int width, int height, bool clear = true );
     bool Create( int width, int height, unsigned char* data, bool static_data = false );
+    bool Create( int width, int height, unsigned char* data, unsigned char* alpha, bool static_data = false );
     void Destroy();
 
     // creates an identical copy of the image (the = operator
@@ -218,10 +220,10 @@ public:
     // draw grey values on the black background although they
     // actually mean to draw white with differnt alpha values.
     // This method reverses it, assuming a black (!) background
-    // and white text (actually only the red channel is read). 
+    // and white text (actually only the red channel is read).
     // The method will then fill up the whole image with the
     // colour given.
-    bool ConvertColourToAlpha( unsigned char r, unsigned char g, unsigned char b ); 
+    bool ConvertColourToAlpha( unsigned char r, unsigned char g, unsigned char b );
 
     static bool CanRead( const wxString& name );
     static int GetImageCount( const wxString& name, long type = wxBITMAP_TYPE_ANY );
@@ -328,7 +330,7 @@ private:
 
 extern void WXDLLEXPORT wxInitAllImageHandlers();
 
-WXDLLEXPORT_DATA(extern wxImage)    wxNullImage;
+extern WXDLLEXPORT_DATA(wxImage)    wxNullImage;
 
 //-----------------------------------------------------------------------------
 // wxImage handlers