More small fixes

[wxWidgets.git] / src / msw / palette.cpp

diff --git a/src/msw/palette.cpp b/src/msw/palette.cpp
index 1eaaa5e0746f43b37f4bc00dbc2a54d2b1a942f1..724140c3aa1fb1925d7a24b32074bafca0c80685 100644 (file)
--- 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);
 }
@@ -64,7 +62,7 @@ wxPalette::~wxPalette(void)
 //     FreeResource(TRUE);
 }
 
-bool wxPalette::FreeResource(bool force)
+bool wxPalette::FreeResource(bool WXUNUSED(force))
 {
        if ( M_PALETTEDATA && M_PALETTEDATA->m_hPalette)
        {
@@ -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;