bump subrelease number

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

diff --git a/src/msw/palette.cpp b/src/msw/palette.cpp
index 891815bf74f790054dab03fc6c7f32f565ec4eb5..d72f0adc406a5b84955532ba6a4b91b1654b2c40 100644 (file)
--- a/src/msw/palette.cpp
+++ b/src/msw/palette.cpp
@@ -1,34 +1,29 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        palette.cpp
+// Name:        src/msw/palette.cpp

 // Purpose:     wxPalette
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Purpose:     wxPalette
 // Author:      Julian Smart
 // 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__
-#pragma implementation "palette.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

-#ifndef WX_PRECOMP
-#include <stdio.h>
-#include "wx/setup.h"
+#if wxUSE_PALETTE
+

 #include "wx/palette.h"
 #include "wx/palette.h"

-#endif

 
 

-#include <windows.h>
+#ifndef WX_PRECOMP
+#endif

 
 

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

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


@@ -39,105 +34,126 @@ IMPLEMENT_DYNAMIC_CLASS(wxPalette, wxGDIObject)
 
 wxPaletteRefData::wxPaletteRefData(void)
 {
 
 wxPaletteRefData::wxPaletteRefData(void)
 {

-  m_hPalette = 0;
+    m_hPalette = 0;

 }
 
 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()

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

 }
 
 wxPalette::~wxPalette(void)
 {
 }
 
 wxPalette::~wxPalette(void)
 {

-//     FreeResource(TRUE);
+//    FreeResource(true);
+}
+
+bool wxPalette::FreeResource(bool WXUNUSED(force))
+{
+    if ( M_PALETTEDATA && M_PALETTEDATA->m_hPalette)
+    {
+        DeleteObject((HPALETTE)M_PALETTEDATA->m_hPalette);
+    }
+    
+    return true;

 }
 
 }
 

-bool wxPalette::FreeResource(bool force)
+int wxPalette::GetColoursCount() const

 {
 {

-       if ( M_PALETTEDATA && M_PALETTEDATA->m_hPalette)
-       {
-      DeleteObject((HPALETTE)M_PALETTEDATA->m_hPalette);
-       }
-       return TRUE;
+    if ( M_PALETTEDATA && M_PALETTEDATA->m_hPalette)
+    {
+        return ::GetPaletteEntries((HPALETTE) M_PALETTEDATA->m_hPalette, 0, 0, NULL );
+    }
+    
+    return 0;

 }
 
 bool wxPalette::Create(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();

 
 

-#ifdef __WXWINE__
+#if defined(__WXMICROWIN__)
+
+    return false;

 
 

-  return (FALSE);
-  

 #else
 
 #else
 

-  m_refData = new wxPaletteRefData;
-
-  NPLOGPALETTE npPal = (NPLOGPALETTE)LocalAlloc(LMEM_FIXED, sizeof(LOGPALETTE) +
-                        (WORD)n * sizeof(PALETTEENTRY));
-  if (!npPal)
-    return(FALSE);
-
-  npPal->palVersion = 0x300;
-  npPal->palNumEntries = n;
-
-  int i;
-  for (i = 0; i < n; i ++)
-  {
-    npPal->palPalEntry[i].peRed = red[i];
-    npPal->palPalEntry[i].peGreen = green[i];
-    npPal->palPalEntry[i].peBlue = blue[i];
-    npPal->palPalEntry[i].peFlags = 0;
-  }
-  M_PALETTEDATA->m_hPalette = (WXHPALETTE) CreatePalette((LPLOGPALETTE)npPal);
-  LocalFree((HANDLE)npPal);
-  return TRUE;
-  
+    m_refData = new wxPaletteRefData;
+
+    NPLOGPALETTE npPal = (NPLOGPALETTE)LocalAlloc(LMEM_FIXED, sizeof(LOGPALETTE) +
+                          (WORD)n * sizeof(PALETTEENTRY));
+    if (!npPal)
+        return false;
+
+    npPal->palVersion = 0x300;
+    npPal->palNumEntries = (WORD)n;
+
+    int i;
+    for (i = 0; i < n; i ++)
+    {
+        npPal->palPalEntry[i].peRed = red[i];
+        npPal->palPalEntry[i].peGreen = green[i];
+        npPal->palPalEntry[i].peBlue = blue[i];
+        npPal->palPalEntry[i].peFlags = 0;
+    }
+    M_PALETTEDATA->m_hPalette = (WXHPALETTE) CreatePalette((LPLOGPALETTE)npPal);
+    LocalFree((HANDLE)npPal);
+    return true;
+

 #endif
 }
 
 #endif
 }
 

-int wxPalette::GetPixel(const unsigned char red, const unsigned char green, const unsigned char blue) const
+int wxPalette::GetPixel(unsigned char red, unsigned char green, unsigned char blue) const

 {
 {

-  if ( !m_refData )
-       return FALSE;
+#ifdef __WXMICROWIN__
+    return wxNOT_FOUND;
+#else
+    if ( !m_refData )
+        return wxNOT_FOUND;

 
 

-  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(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;
-
-  if (index < 0 || index > 255)
-         return FALSE;
-
-  PALETTEENTRY entry;
-  if (::GetPaletteEntries((HPALETTE) M_PALETTEDATA->m_hPalette, index, 1, &entry))
-  {
-         *red = entry.peRed;
-         *green = entry.peGreen;
-         *blue = entry.peBlue;
-         return TRUE;
-  } else
-         return FALSE;
+#ifdef __WXMICROWIN__
+    return false;
+#else
+    if ( !m_refData )
+        return false;
+
+    if (index < 0 || index > 255)
+        return false;
+
+    PALETTEENTRY entry;
+    if (::GetPaletteEntries((HPALETTE) M_PALETTEDATA->m_hPalette, index, 1, &entry))
+    {
+        *red = entry.peRed;
+        *green = entry.peGreen;
+        *blue = entry.peBlue;
+        return true;
+    }
+    else
+        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