setting clipping correctly

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

diff --git a/src/msw/palette.cpp b/src/msw/palette.cpp
index c958a25a2a5dee0d9022a3d04080f0002df552f2..d72f0adc406a5b84955532ba6a4b91b1654b2c40 100644 (file)
--- a/src/msw/palette.cpp
+++ b/src/msw/palette.cpp
@@ -18,8 +18,9 @@
 
 #if wxUSE_PALETTE
 
 
 #if wxUSE_PALETTE
 

+#include "wx/palette.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/palette.h"

 #endif
 
 #include "wx/msw/private.h"
 #endif
 
 #include "wx/msw/private.h"


@@ -42,13 +43,13 @@ wxPaletteRefData::~wxPaletteRefData(void)
         ::DeleteObject((HPALETTE) 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)


@@ -60,11 +61,22 @@ 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;
 }
 

+int wxPalette::GetColoursCount() const
+{
+    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)
 {
     UnRef();
 bool wxPalette::Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue)
 {
     UnRef();