moved MGL initialization to earlier stage (crashes otherwise...) and implemented...

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

diff --git a/include/wx/image.h b/include/wx/image.h
index 44a63769c2e9c7c0728edb54dfbf72919d5ed609..4c145b247d858825f45956b1b24e0534a8cda906 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
 //-----------------------------------------------------------------------------
@@ -101,10 +103,9 @@ public:
 #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
 
@@ -142,7 +143,7 @@ public:
                   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 );
+    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 );
@@ -184,10 +185,12 @@ public:
     void SetMask( bool mask = TRUE );
     bool HasMask() const;
 
+#if wxUSE_PALETTE
     // Palette functions
     bool HasPalette() const;
     const wxPalette& GetPalette() const;
     void SetPalette(const wxPalette& palette);
+#endif // wxUSE_PALETTE
 
     // Option functions (arbitrary name/value mapping)
     void SetOption(const wxString& name, const wxString& value);
@@ -248,6 +251,9 @@ WXDLLEXPORT_DATA(extern wxImage)    wxNullImage;
 #include "wx/imagjpeg.h"
 #include "wx/imagtiff.h"
 #include "wx/imagpnm.h"
+#include "wx/imagxpm.h"
+
+#endif // wxUSE_IMAGE
 
 #endif
   // _WX_IMAGE_H_