Project file corrections, doc corrections

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

diff --git a/include/wx/image.h b/include/wx/image.h
index adfce58b9cd34e00783b82aff89c5c913b3b1af6..88f26a453baa6df6506ba0d86c19456702d278c3 100644 (file)
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -151,6 +151,10 @@ public:
     unsigned char GetGreen( int x, int y ) const;
     unsigned char GetBlue( int x, int y ) const;
 
+    // used to manipulate the icons while extracting from .ico files   
+    bool GetUnusedColour(  unsigned char *r,  unsigned char *g,  unsigned char *b );
+    bool ApplyMask( const wxImage & mask );
+
     static bool CanRead( const wxString& name );
     virtual bool LoadFile( const wxString& name, long type = wxBITMAP_TYPE_ANY );
     virtual bool LoadFile( const wxString& name, const wxString& mimetype );
@@ -185,10 +189,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);