X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3f4fc7967b595ea8257696baff78e1866511223d..c3357374af44fdcae9d326e62ab5a39d9517102d:/include/wx/image.h

diff --git a/include/wx/image.h b/include/wx/image.h
index af2bd95b70..7e872e3911 100644
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -169,7 +169,8 @@ public:
     char unsigned *GetData() const;
     void SetData( char unsigned *data );
     void SetData( char unsigned *data, int new_width, int new_height );
-    
+
+    // Mask functions
     void SetMaskColour( unsigned char r, unsigned char g, unsigned char b );
     unsigned char GetMaskRed() const;
     unsigned char GetMaskGreen() const;
@@ -177,9 +178,17 @@ public:
     void SetMask( bool mask = TRUE );
     bool HasMask() const;
 
-    bool HasPalette() const { return m_palette.Ok(); }
-    const wxPalette& GetPalette() const { return m_palette; }
-    void SetPalette(const wxPalette& palette) { m_palette = palette; }
+    // Palette functions
+    bool HasPalette() const;
+    const wxPalette& GetPalette() const;
+    void SetPalette(const wxPalette& palette);
+
+    // Option functions (arbitrary name/value mapping)
+    void SetOption(const wxString& name, const wxString& value);
+    void SetOption(const wxString& name, int value);
+    wxString GetOption(const wxString& name) const;
+    int GetOptionInt(const wxString& name) const;
+    bool HasOption(const wxString& name) const;
 
     unsigned long CountColours( unsigned long stopafter = (unsigned long) -1 );
     unsigned long ComputeHistogram( wxHashTable &h );
@@ -209,8 +218,7 @@ public:
     static void InitStandardHandlers();
 
 protected:
-    static wxList sm_handlers;
-    wxPalette m_palette;
+    static wxList   sm_handlers;
 
 private:
     friend class WXDLLEXPORT wxImageHandler;