compatibility changes: WXWIN_COMPATIBILITY_EVENT_TYPES and DECLARE_EVENT_TABLE_ENTRY...

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

diff --git a/include/wx/image.h b/include/wx/image.h
index 423dc55f6960f66f1f401007a5a47a8d3a950054..7e872e39118a630c193ecd9259e1f28cdfcd48f9 100644 (file)
--- 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,6 +178,18 @@ public:
     void SetMask( bool mask = TRUE );
     bool HasMask() const;
 
+    // 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 );
 
@@ -205,7 +218,7 @@ public:
     static void InitStandardHandlers();
 
 protected:
-    static wxList sm_handlers;
+    static wxList   sm_handlers;
 
 private:
     friend class WXDLLEXPORT wxImageHandler;