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 4a73bb28b27b3895dd6b9a8f14ac56eecf89255f..dc9dfabf86fdb4c9fe197c705ffdfc659eb207a1 100644 (file)
--- a/src/msw/palette.cpp
+++ b/src/msw/palette.cpp
@@ -9,10 +9,6 @@
 // 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"
 
@@ -87,7 +83,7 @@ bool wxPalette::Create(int n, const unsigned char *red, const unsigned char *gre
     return false;
 
   npPal->palVersion = 0x300;
-  npPal->palNumEntries = n;
+  npPal->palNumEntries = (WORD)n;
 
   int i;
   for (i = 0; i < n; i ++)