correction for Mac OS compilation

[wxWidgets.git] / wxPython / src / image.i

diff --git a/wxPython/src/image.i b/wxPython/src/image.i
index 04d1bb5d6251a0b24ccc7f06b4e023d2c81374f0..37757eeb54c8a62d6283c6788defe8c00f5ee0f9 100644 (file)
--- a/wxPython/src/image.i
+++ b/wxPython/src/image.i
@@ -30,7 +30,7 @@
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

-class wxImageHandler {
+class wxImageHandler : public wxObject {

 public:
     // wxImageHandler();    Abstract Base Class
     wxString GetName();
 public:
     // wxImageHandler();    Abstract Base Class
     wxString GetName();


@@ -90,12 +90,15 @@ public:
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

-class wxImage {
+class wxImage : public wxObject {

 public:
     wxImage( const wxString& name, long type = wxBITMAP_TYPE_ANY );
     ~wxImage();
 
     wxBitmap ConvertToBitmap();
 public:
     wxImage( const wxString& name, long type = wxBITMAP_TYPE_ANY );
     ~wxImage();
 
     wxBitmap ConvertToBitmap();

+#ifdef __WXGTK__
+    wxBitmap ConvertToMonoBitmap( unsigned char red, unsigned char green, unsigned char blue ) const;
+#endif

     void Create( int width, int height );
     void Destroy();
     wxImage Scale( int width, int height );
     void Create( int width, int height );
     void Destroy();
     wxImage Scale( int width, int height );


@@ -169,6 +172,7 @@ public:
     static bool RemoveHandler( const wxString& name );
 };
 
     static bool RemoveHandler( const wxString& name );
 };
 

+

 // Alternate constructors
 %new wxImage* wxEmptyImage(int width=0, int height=0);
 %new wxImage* wxImageFromMime(const wxString& name, const wxString& mimetype);
 // Alternate constructors
 %new wxImage* wxEmptyImage(int width=0, int height=0);
 %new wxImage* wxImageFromMime(const wxString& name, const wxString& mimetype);


@@ -208,4 +212,16 @@ extern wxImage    wxNullImage;
 
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------

+// This one is here to avoid circular imports
+
+%new wxBitmap* wxBitmapFromImage(const wxImage& img, int depth=-1);
+
+%{
+    wxBitmap* wxBitmapFromImage(const wxImage& img, int depth=-1) {
+        return new wxBitmap(img, depth);
+    }
+
+%}
+
+

 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------