get rid of duplicate comment :)

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

diff --git a/src/msw/palette.cpp b/src/msw/palette.cpp
index 1eaaa5e0746f43b37f4bc00dbc2a54d2b1a942f1..0d46158e021b7d199fefef3c803b844f56e400c8 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$
 // 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
 
 #pragma implementation "palette.h"
 #endif
 


@@ -17,22 +17,18 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_PALETTE
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#include <stdio.h>
-#include "wx/setup.h"
-#include "wx/palette.h"
+    #include "wx/palette.h"

 #endif
 
 #endif
 

-#include <windows.h>
-
-#include "assert.h"
+#include "wx/msw/private.h"

 
 

-#if !USE_SHARED_LIBRARIES

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

-#endif

 
 /*
  * Palette
 
 /*
  * Palette


@@ -46,46 +42,52 @@ wxPaletteRefData::wxPaletteRefData(void)
 
 wxPaletteRefData::~wxPaletteRefData(void)
 {
 
 wxPaletteRefData::~wxPaletteRefData(void)
 {

-       if ( m_hPalette )
-               ::DeleteObject((HPALETTE) m_hPalette);
+    if ( m_hPalette )
+        ::DeleteObject((HPALETTE) m_hPalette);

 }
 
 wxPalette::wxPalette(void)
 {
 }
 
 }
 
 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);
 }
 
 wxPalette::~wxPalette(void)
 {
 {
   Create(n, red, green, blue);
 }
 
 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)
+    {

       DeleteObject((HPALETTE)M_PALETTEDATA->m_hPalette);
       DeleteObject((HPALETTE)M_PALETTEDATA->m_hPalette);

-       }
-       return TRUE;
+    }
+    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();
 
 {
   UnRef();
 

+#if defined(__WXMICROWIN__)
+
+  return false;
+
+#else
+

   m_refData = new wxPaletteRefData;
 
   NPLOGPALETTE npPal = (NPLOGPALETTE)LocalAlloc(LMEM_FIXED, sizeof(LOGPALETTE) +
                         (WORD)n * sizeof(PALETTEENTRY));
   if (!npPal)
   m_refData = new wxPaletteRefData;
 
   NPLOGPALETTE npPal = (NPLOGPALETTE)LocalAlloc(LMEM_FIXED, sizeof(LOGPALETTE) +
                         (WORD)n * sizeof(PALETTEENTRY));
   if (!npPal)

-    return(FALSE);
+    return false;

 
   npPal->palVersion = 0x300;
 
   npPal->palVersion = 0x300;

-  npPal->palNumEntries = n;
+  npPal->palNumEntries = (WORD)n;

 
   int i;
   for (i = 0; i < n; i ++)
 
   int i;
   for (i = 0; i < n; i ++)


@@ -97,24 +99,33 @@ bool wxPalette::Create(const int n, const unsigned char *red, const unsigned cha
   }
   M_PALETTEDATA->m_hPalette = (WXHPALETTE) CreatePalette((LPLOGPALETTE)npPal);
   LocalFree((HANDLE)npPal);
   }
   M_PALETTEDATA->m_hPalette = (WXHPALETTE) CreatePalette((LPLOGPALETTE)npPal);
   LocalFree((HANDLE)npPal);

-  return TRUE;
+  return true;
+
+#endif

 }
 
 int wxPalette::GetPixel(const unsigned char red, const unsigned char green, const unsigned char blue) const
 {
 }
 
 int wxPalette::GetPixel(const unsigned char red, const unsigned char green, const unsigned char blue) const
 {

+#ifdef __WXMICROWIN__
+  return 0;
+#else

   if ( !m_refData )
   if ( !m_refData )

-       return FALSE;
+    return 0;

 
   return ::GetNearestPaletteIndex((HPALETTE) M_PALETTEDATA->m_hPalette, PALETTERGB(red, green, blue));
 
   return ::GetNearestPaletteIndex((HPALETTE) M_PALETTEDATA->m_hPalette, PALETTERGB(red, green, blue));

+#endif

 }
 
 }
 

-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

 {
 {

+#ifdef __WXMICROWIN__
+  return false;
+#else

   if ( !m_refData )
   if ( !m_refData )

-       return FALSE;
+    return false;

 
   if (index < 0 || index > 255)
 
   if (index < 0 || index > 255)

-         return FALSE;
+         return false;

 
   PALETTEENTRY entry;
   if (::GetPaletteEntries((HPALETTE) M_PALETTEDATA->m_hPalette, index, 1, &entry))
 
   PALETTEENTRY entry;
   if (::GetPaletteEntries((HPALETTE) M_PALETTEDATA->m_hPalette, index, 1, &entry))


@@ -122,16 +133,19 @@ bool wxPalette::GetRGB(const int index, unsigned char *red, unsigned char *green
          *red = entry.peRed;
          *green = entry.peGreen;
          *blue = entry.peBlue;
          *red = entry.peRed;
          *green = entry.peGreen;
          *blue = entry.peBlue;

-         return TRUE;
+         return true;

   } else
   } else

-         return FALSE;
+         return false;
+#endif

 }
 
 void wxPalette::SetHPALETTE(WXHPALETTE pal)
 {
 }
 
 void wxPalette::SetHPALETTE(WXHPALETTE pal)
 {

-       if ( !m_refData )
-               m_refData = new wxPaletteRefData;
+    if ( !m_refData )
+        m_refData = new wxPaletteRefData;

 
     M_PALETTEDATA->m_hPalette = pal;
 }
 
 
     M_PALETTEDATA->m_hPalette = pal;
 }
 

+#endif // wxUSE_PALETTE
+