added wxUSE_PALETTE and fixed compilation with it set to 0

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11749 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-09-30 22:06:39 +00:00
parent f1c1831fc5
commit d275c7eb84
21 changed files with 227 additions and 101 deletions

View File

@@ -58,7 +58,9 @@ public:
unsigned char m_maskRed,m_maskGreen,m_maskBlue;
bool m_ok;
bool m_static;
#if wxUSE_PALETTE
wxPalette m_palette;
#endif // wxUSE_PALETTE
wxArrayString m_optionNames;
wxArrayString m_optionValues;
};
@@ -718,6 +720,8 @@ int wxImage::GetHeight() const
return M_IMGDATA->m_height;
}
#if wxUSE_PALETTE
// Palette functions
bool wxImage::HasPalette() const
@@ -742,6 +746,8 @@ void wxImage::SetPalette(const wxPalette& palette)
M_IMGDATA->m_palette = palette;
}
#endif // wxUSE_PALETTE
// Option functions (arbitrary name/value mapping)
void wxImage::SetOption(const wxString& name, const wxString& value)
{