projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix unused variable warning when wxUSE_PALETTE==0
[wxWidgets.git]
/
src
/
generic
/
paletteg.cpp
diff --git
a/src/generic/paletteg.cpp
b/src/generic/paletteg.cpp
index 24900fc538548721c72e8a08ed153ee9fd6a67a6..87945ca2743d9ebfbdd515189648df8c3312bd35 100644
(file)
--- a/
src/generic/paletteg.cpp
+++ b/
src/generic/paletteg.cpp
@@
-33,7
+33,7
@@
class wxPaletteRefData: public wxObjectRefData
public:
wxPaletteRefData(void);
public:
wxPaletteRefData(void);
- ~wxPaletteRefData(void);
+
virtual
~wxPaletteRefData(void);
int m_count;
wxPaletteEntry *m_entries;
int m_count;
wxPaletteEntry *m_entries;
@@
-66,23
+66,10
@@
wxPalette::wxPalette(int n, const unsigned char *red, const unsigned char *green
Create(n, red, green, blue);
}
Create(n, red, green, blue);
}
-wxPalette::wxPalette(const wxPalette& palette)
- : wxPaletteBase()
-{
- Ref(palette);
-}
-
wxPalette::~wxPalette()
{
}
wxPalette::~wxPalette()
{
}
-wxPalette& wxPalette::operator = (const wxPalette& palette)
-{
- if (*this == palette) return (*this);
- Ref(palette);
- return *this;
-}
-
bool wxPalette::operator == (const wxPalette& palette) const
{
return m_refData == palette.m_refData;
bool wxPalette::operator == (const wxPalette& palette) const
{
return m_refData == palette.m_refData;
@@
-93,11
+80,19
@@
bool wxPalette::operator != (const wxPalette& palette) const
return m_refData != palette.m_refData;
}
return m_refData != palette.m_refData;
}
-bool wxPalette::Ok(
void
) const
+bool wxPalette::Ok() const
{
return (m_refData != NULL);
}
{
return (m_refData != NULL);
}
+int wxPalette::GetColoursCount() const
+{
+ if (m_refData)
+ return M_PALETTEDATA->m_count;
+
+ return 0;
+}
+
bool wxPalette::Create(int n,
const unsigned char *red,
const unsigned char *green,
bool wxPalette::Create(int n,
const unsigned char *red,
const unsigned char *green,