wxPython updates (SWIG really works, cannot believe it)

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

diff --git a/include/wx/image.h b/include/wx/image.h
index a8cf85145db9ed52e04abe3ba6457ba90c140bbb..fe15103b2a0b9fbea3a06f0809d12cb545b14561 100644 (file)
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -28,6 +28,8 @@ class WXDLLEXPORT wxPNGHandler;
 class WXDLLEXPORT wxBMPHandler;
 class WXDLLEXPORT wxImage;
 
+class WXDLLEXPORT wxBitmap;
+
 //-----------------------------------------------------------------------------
 // wxImageHandler
 //-----------------------------------------------------------------------------
@@ -115,10 +117,22 @@ public:
   
   wxImage( const wxImage& image );
   wxImage( const wxImage* image );
+  
+  // these functions get implemented in /src/(platform)/bitmap.cpp 
+  wxImage( const wxBitmap &bitmap );
+  wxBitmap ConvertToBitmap() const;
 
   void Create( int width, int height );
   void Destroy();
   
+  wxImage Scale( int width, int height );
+  
+  // these routines are slow but safe  
+  void SetRGB( int x, int y, unsigned char r, unsigned char g, unsigned char b );
+  unsigned char GetRed( int x, int y );
+  unsigned char GetGreen( int x, int y );
+  unsigned char GetBlue( int x, int y );
+  
   virtual bool LoadFile( const wxString& name, long type = wxBITMAP_TYPE_PNG );
   virtual bool SaveFile( const wxString& name, int type );