projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
change UpdateSelection() parameter type to int from size_t; also replaced remaining...
[wxWidgets.git]
/
include
/
wx
/
palmos
/
palette.h
diff --git
a/include/wx/palmos/palette.h
b/include/wx/palmos/palette.h
index 090a9b6a203e6b69ccf8a4b24487e4d632275bed..0229985a7a774bc698bc1f9945a617193a6de7cc 100644
(file)
--- a/
include/wx/palmos/palette.h
+++ b/
include/wx/palmos/palette.h
@@
-21,7
+21,7
@@
class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData
friend class WXDLLEXPORT wxPalette;
public:
wxPaletteRefData(void);
friend class WXDLLEXPORT wxPalette;
public:
wxPaletteRefData(void);
- ~wxPaletteRefData(void);
+
virtual
~wxPaletteRefData(void);
protected:
WXHPALETTE m_hPalette;
};
protected:
WXHPALETTE m_hPalette;
};
@@
-34,17
+34,16
@@
class WXDLLEXPORT wxPalette: public wxPaletteBase
public:
wxPalette(void);
public:
wxPalette(void);
- inline wxPalette(const wxPalette& palette) { Ref(palette); }
wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
- ~wxPalette(void);
+
virtual
~wxPalette(void);
bool Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
bool Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
- int GetPixel(
const unsigned char red, const unsigned char green, const
unsigned char blue) const;
+ int GetPixel(
unsigned char red, unsigned char green,
unsigned char blue) const;
bool GetRGB(int pixel, unsigned char *red, unsigned char *green, unsigned char *blue) const;
bool GetRGB(int pixel, unsigned char *red, unsigned char *green, unsigned char *blue) const;
- virtual bool Ok(void) const { return (m_refData != NULL) ; }
+ virtual bool Ok() const { return IsOk(); }
+ virtual bool IsOk(void) const { return (m_refData != NULL) ; }
- inline wxPalette& operator = (const wxPalette& palette) { if (*this == palette) return (*this); Ref(palette); return *this; }
inline bool operator == (const wxPalette& palette) const { return m_refData == palette.m_refData; }
inline bool operator != (const wxPalette& palette) const { return m_refData != palette.m_refData; }
inline bool operator == (const wxPalette& palette) const { return m_refData == palette.m_refData; }
inline bool operator != (const wxPalette& palette) const { return m_refData != palette.m_refData; }