set error to GSOCK_TIMEOUT if the socket timed out (modified and extended patch 1303554)

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

diff --git a/src/msw/palette.cpp b/src/msw/palette.cpp
index 40573ae14870a8f9b596e86e6a64b55f4ec1bbfe..dc9dfabf86fdb4c9fe197c705ffdfc659eb207a1 100644 (file)
--- a/src/msw/palette.cpp
+++ b/src/msw/palette.cpp
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "palette.h"
-#endif
-

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


@@ -57,7 +53,7 @@ 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 WXUNUSED(force))
 }
 
 bool wxPalette::FreeResource(bool WXUNUSED(force))


@@ -66,7 +62,7 @@ bool wxPalette::FreeResource(bool WXUNUSED(force))
     {
       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)
 }
 
 bool wxPalette::Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue)


@@ -75,7 +71,7 @@ bool wxPalette::Create(int n, const unsigned char *red, const unsigned char *gre
 
 #if defined(__WXMICROWIN__)
 
 
 #if defined(__WXMICROWIN__)
 

-  return (FALSE);
+  return false;

 
 #else
 
 
 #else
 


@@ -84,10 +80,10 @@ 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)
   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 ++)


@@ -99,7 +95,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);
   }
   M_PALETTEDATA->m_hPalette = (WXHPALETTE) CreatePalette((LPLOGPALETTE)npPal);
   LocalFree((HANDLE)npPal);

-  return TRUE;
+  return true;

 
 #endif
 }
 
 #endif
 }


@@ -107,10 +103,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__
 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 )
 #else
   if ( !m_refData )

-    return FALSE;
+    return 0;

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


@@ -119,13 +115,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__
 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 )
 #else
   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))


@@ -133,9 +129,9 @@ bool wxPalette::GetRGB(int index, unsigned char *red, unsigned char *green, unsi
          *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
 }
 
 #endif
 }