fixes for new lib dirs for wxMSW

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

diff --git a/src/msw/palette.cpp b/src/msw/palette.cpp
index 891815bf74f790054dab03fc6c7f32f565ec4eb5..40573ae14870a8f9b596e86e6a64b55f4ec1bbfe 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,18 +17,16 @@
 #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"

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


@@ -44,8 +42,8 @@ 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)


@@ -59,26 +57,26 @@ wxPalette::wxPalette(int n, const unsigned char *red, const unsigned char *green
 
 wxPalette::~wxPalette(void)
 {
 
 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(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();
 

-#ifdef __WXWINE__
+#if defined(__WXMICROWIN__)

 
   return (FALSE);
 
   return (FALSE);

-  
+

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


@@ -102,22 +100,29 @@ 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
 }
 
 int wxPalette::GetPixel(const unsigned char red, const unsigned char green, const unsigned char blue) const
 {
 #endif
 }
 
 int wxPalette::GetPixel(const unsigned char red, const unsigned char green, const unsigned char blue) const
 {

+#ifdef __WXMICROWIN__
+  return FALSE;
+#else

   if ( !m_refData )
   if ( !m_refData )

-       return FALSE;
+    return FALSE;

 
   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
 {

+#ifdef __WXMICROWIN__
+  return FALSE;
+#else

   if ( !m_refData )
   if ( !m_refData )

-       return FALSE;
+    return FALSE;

 
   if (index < 0 || index > 255)
          return FALSE;
 
   if (index < 0 || index > 255)
          return FALSE;


@@ -131,13 +136,16 @@ bool wxPalette::GetRGB(int index, unsigned char *red, unsigned char *green, unsi
          return TRUE;
   } else
          return FALSE;
          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
+