added dependency handling to Makefiles

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

diff --git a/include/wx/image.h b/include/wx/image.h
index 7e872e39118a630c193ecd9259e1f28cdfcd48f9..adfce58b9cd34e00783b82aff89c5c913b3b1af6 100644 (file)
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -24,6 +24,8 @@
 #  include "wx/stream.h"
 #endif
 
+#if wxUSE_IMAGE
+
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
@@ -98,11 +100,13 @@ public:
     wxImage( const wxImage& image );
     wxImage( const wxImage* image );
 
+#if wxUSE_GUI
+    // convertion to/from wxBitmap (deprecated, use wxBitmap's methods instead):
     wxImage( const wxBitmap &bitmap );
-    operator wxBitmap() const { return ConvertToBitmap(); }
     wxBitmap ConvertToBitmap() const;
 #ifdef __WXGTK__
-    wxBitmap ConvertToMonoBitmap( unsigned char red, unsigned char green, unsigned char blue );
+    wxBitmap ConvertToMonoBitmap( unsigned char red, unsigned char green, unsigned char blue ) const;
+#endif
 #endif
 
     void Create( int width, int height );
@@ -137,6 +141,9 @@ public:
     // replace one colour with another
     void Replace( unsigned char r1, unsigned char g1, unsigned char b1,
                   unsigned char r2, unsigned char g2, unsigned char b2 );
+                 
+    // convert to monochrome image (<r,g,b> will be replaced by white, everything else by black)
+    wxImage ConvertToMono( unsigned char r, unsigned char g, unsigned char b ) const;
 
     // these routines are slow but safe
     void SetRGB( int x, int y, unsigned char r, unsigned char g, unsigned char b );
@@ -229,6 +236,7 @@ private:
 
 extern void WXDLLEXPORT wxInitAllImageHandlers();
 
+WXDLLEXPORT_DATA(extern wxImage)    wxNullImage;
 
 //-----------------------------------------------------------------------------
 // wxImage handlers
@@ -241,6 +249,9 @@ extern void WXDLLEXPORT wxInitAllImageHandlers();
 #include "wx/imagjpeg.h"
 #include "wx/imagtiff.h"
 #include "wx/imagpnm.h"
+#include "wx/imagxpm.h"
+
+#endif // wxUSE_IMAGE
 
 #endif
   // _WX_IMAGE_H_