Added Set/Get/HasOption members and moved palette to ref data class.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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;
|
||||
|
Reference in New Issue
Block a user