Applied patch #421073 (making setup options work)

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

diff --git a/src/msw/palette.cpp b/src/msw/palette.cpp
index 77569777f75801c880467ef20d07c0739567a13a..724140c3aa1fb1925d7a24b32074bafca0c80685 100644 (file)
--- a/src/msw/palette.cpp
+++ b/src/msw/palette.cpp
@@ -30,9 +30,7 @@
 
 #include "assert.h"
 
 
 #include "assert.h"
 

-#if !USE_SHARED_LIBRARIES

 IMPLEMENT_DYNAMIC_CLASS(wxPalette, wxGDIObject)
 IMPLEMENT_DYNAMIC_CLASS(wxPalette, wxGDIObject)

-#endif

 
 /*
  * Palette
 
 /*
  * Palette


@@ -64,7 +62,7 @@ wxPalette::~wxPalette(void)
 //     FreeResource(TRUE);
 }
 
 //     FreeResource(TRUE);
 }
 

-bool wxPalette::FreeResource(bool force)
+bool wxPalette::FreeResource(bool WXUNUSED(force))

 {
        if ( M_PALETTEDATA && M_PALETTEDATA->m_hPalette)
        {
 {
        if ( M_PALETTEDATA && M_PALETTEDATA->m_hPalette)
        {


@@ -80,7 +78,7 @@ bool wxPalette::Create(int n, const unsigned char *red, const unsigned char *gre
 #ifdef __WXWINE__
 
   return (FALSE);
 #ifdef __WXWINE__
 
   return (FALSE);

-  
+

 #else
 
   m_refData = new wxPaletteRefData;
 #else
 
   m_refData = new wxPaletteRefData;


@@ -104,7 +102,7 @@ bool wxPalette::Create(int n, const unsigned char *red, const unsigned char *gre
   M_PALETTEDATA->m_hPalette = (WXHPALETTE) CreatePalette((LPLOGPALETTE)npPal);
   LocalFree((HANDLE)npPal);
   return TRUE;
   M_PALETTEDATA->m_hPalette = (WXHPALETTE) CreatePalette((LPLOGPALETTE)npPal);
   LocalFree((HANDLE)npPal);
   return TRUE;

-  
+

 #endif
 }
 
 #endif
 }