Add some version checks to help compiling on OSX.

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

diff --git a/src/palmos/palette.cpp b/src/palmos/palette.cpp
index 529840dcbdd10f9765b3003cf77fcd54cf2412be..51ac2c83a02d75825d0463c3b1dd02e4da58b48c 100644 (file)
--- a/src/palmos/palette.cpp
+++ b/src/palmos/palette.cpp
@@ -1,18 +1,14 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxPalette
 // Purpose:     wxPalette

-// Author:      William Osborne
+// Author:      William Osborne - minimal working wxPalmOS port

 // Modified by:
 // Created:     10/13/04
 // Modified by:
 // Created:     10/13/04

-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$

 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Copyright:   (c) William Osborne
 // 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"
 


@@ -22,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/palmos/private.h"
 #endif
 
 #include "wx/palmos/private.h"


@@ -65,9 +62,9 @@ bool wxPalette::Create(int n, const unsigned char *red, const unsigned char *gre
     return false;
 }
 
     return false;
 }
 

-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

 {
 {

-    return 0;
+    return wxNOT_FOUND;

 }
 
 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


@@ -80,4 +77,3 @@ void wxPalette::SetHPALETTE(WXHPALETTE pal)
 }
 
 #endif // wxUSE_PALETTE
 }
 
 #endif // wxUSE_PALETTE

-