WinCE warning fix.

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

diff --git a/src/msw/palette.cpp b/src/msw/palette.cpp
index 7d88c7fe722c8112ec4187d2e573b62964b2d2bc..4a73bb28b27b3895dd6b9a8f14ac56eecf89255f 100644 (file)
--- a/src/msw/palette.cpp
+++ b/src/msw/palette.cpp
@@ -5,11 +5,11 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "palette.h"
 #endif
 
@@ -17,18 +17,16 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
+#if wxUSE_PALETTE
+
 #ifndef WX_PRECOMP
-#include <stdio.h>
-#include "wx/setup.h"
-#include "wx/palette.h"
+    #include "wx/palette.h"
 #endif
 
-#include <windows.h>
-
-#include "assert.h"
+#include "wx/msw/private.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxPalette, wxGDIObject)
 
@@ -44,8 +42,8 @@ wxPaletteRefData::wxPaletteRefData(void)
 
 wxPaletteRefData::~wxPaletteRefData(void)
 {
-       if ( m_hPalette )
-               ::DeleteObject((HPALETTE) m_hPalette);
+    if ( m_hPalette )
+        ::DeleteObject((HPALETTE) m_hPalette);
 }
 
 wxPalette::wxPalette(void)
@@ -59,25 +57,25 @@ wxPalette::wxPalette(int n, const unsigned char *red, const unsigned char *green
 
 wxPalette::~wxPalette(void)
 {
-//     FreeResource(TRUE);
+//    FreeResource(true);
 }
 
 bool wxPalette::FreeResource(bool WXUNUSED(force))
 {
-       if ( M_PALETTEDATA && M_PALETTEDATA->m_hPalette)
-       {
+    if ( M_PALETTEDATA && M_PALETTEDATA->m_hPalette)
+    {
       DeleteObject((HPALETTE)M_PALETTEDATA->m_hPalette);
-       }
-       return TRUE;
+    }
+    return true;
 }
 
 bool wxPalette::Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue)
 {
   UnRef();
 
-#if defined(__WXWINE__) || defined(__WXMICROWIN__)
+#if defined(__WXMICROWIN__)
 
-  return (FALSE);
+  return false;
 
 #else
 
@@ -86,7 +84,7 @@ bool wxPalette::Create(int n, const unsigned char *red, const unsigned char *gre
   NPLOGPALETTE npPal = (NPLOGPALETTE)LocalAlloc(LMEM_FIXED, sizeof(LOGPALETTE) +
                         (WORD)n * sizeof(PALETTEENTRY));
   if (!npPal)
-    return(FALSE);
+    return false;
 
   npPal->palVersion = 0x300;
   npPal->palNumEntries = n;
@@ -101,7 +99,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;
+  return true;
 
 #endif
 }
@@ -109,10 +107,10 @@ bool wxPalette::Create(int n, const unsigned char *red, const unsigned char *gre
 int wxPalette::GetPixel(const unsigned char red, const unsigned char green, const unsigned char blue) const
 {
 #ifdef __WXMICROWIN__
-  return FALSE;
+  return 0;
 #else
   if ( !m_refData )
-       return FALSE;
+    return 0;
 
   return ::GetNearestPaletteIndex((HPALETTE) M_PALETTEDATA->m_hPalette, PALETTERGB(red, green, blue));
 #endif
@@ -121,13 +119,13 @@ int wxPalette::GetPixel(const unsigned char red, const unsigned char green, cons
 bool wxPalette::GetRGB(int index, unsigned char *red, unsigned char *green, unsigned char *blue) const
 {
 #ifdef __WXMICROWIN__
-  return FALSE;
+  return false;
 #else
   if ( !m_refData )
-       return FALSE;
+    return false;
 
   if (index < 0 || index > 255)
-         return FALSE;
+         return false;
 
   PALETTEENTRY entry;
   if (::GetPaletteEntries((HPALETTE) M_PALETTEDATA->m_hPalette, index, 1, &entry))
@@ -135,17 +133,19 @@ bool wxPalette::GetRGB(int index, unsigned char *red, unsigned char *green, unsi
          *red = entry.peRed;
          *green = entry.peGreen;
          *blue = entry.peBlue;
-         return TRUE;
+         return true;
   } else
-         return FALSE;
+         return false;
 #endif
 }
 
 void wxPalette::SetHPALETTE(WXHPALETTE pal)
 {
-       if ( !m_refData )
-               m_refData = new wxPaletteRefData;
+    if ( !m_refData )
+        m_refData = new wxPaletteRefData;
 
     M_PALETTEDATA->m_hPalette = pal;
 }
 
+#endif // wxUSE_PALETTE
+