X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2bda0e173844e8e0f8acf4e8ad8b5c26e5c6fe5d..2ed3265e18ed0470d7b56bc2a8a6796c697b90af:/src/msw/palette.cpp diff --git a/src/msw/palette.cpp b/src/msw/palette.cpp index 1eaaa5e074..891815bf74 100644 --- a/src/msw/palette.cpp +++ b/src/msw/palette.cpp @@ -30,9 +30,7 @@ #include "assert.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxPalette, wxGDIObject) -#endif /* * Palette @@ -54,7 +52,7 @@ wxPalette::wxPalette(void) { } -wxPalette::wxPalette(const int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue) +wxPalette::wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue) { Create(n, red, green, blue); } @@ -73,10 +71,16 @@ bool wxPalette::FreeResource(bool force) return TRUE; } -bool wxPalette::Create(const int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue) +bool wxPalette::Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue) { UnRef(); +#ifdef __WXWINE__ + + return (FALSE); + +#else + m_refData = new wxPaletteRefData; NPLOGPALETTE npPal = (NPLOGPALETTE)LocalAlloc(LMEM_FIXED, sizeof(LOGPALETTE) + @@ -98,6 +102,8 @@ bool wxPalette::Create(const int n, const unsigned char *red, const unsigned cha M_PALETTEDATA->m_hPalette = (WXHPALETTE) CreatePalette((LPLOGPALETTE)npPal); LocalFree((HANDLE)npPal); return TRUE; + +#endif } int wxPalette::GetPixel(const unsigned char red, const unsigned char green, const unsigned char blue) const @@ -108,7 +114,7 @@ int wxPalette::GetPixel(const unsigned char red, const unsigned char green, cons return ::GetNearestPaletteIndex((HPALETTE) M_PALETTEDATA->m_hPalette, PALETTERGB(red, green, blue)); } -bool wxPalette::GetRGB(const int index, unsigned char *red, unsigned char *green, unsigned char *blue) const +bool wxPalette::GetRGB(int index, unsigned char *red, unsigned char *green, unsigned char *blue) const { if ( !m_refData ) return FALSE;