Some changes in a vain attempt to make Salford C++ work; added FAQ files;

[wxWidgets.git] / include / wx / msw / palette.h

diff --git a/include/wx/msw/palette.h b/include/wx/msw/palette.h
index bddc8a334ce99cf78ca94196e6d1092977b0f433..4383c44a3f7c85df05a989e9871e8dddb1e1aae7 100644 (file)
--- a/include/wx/msw/palette.h
+++ b/include/wx/msw/palette.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:    wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __PALETTEH__
-#define __PALETTEH__
+#ifndef _WX_PALETTE_H_
+#define _WX_PALETTE_H_

 
 #ifdef __GNUG__
 #pragma interface "palette.h"
 
 #ifdef __GNUG__
 #pragma interface "palette.h"


@@ -39,13 +39,12 @@ class WXDLLEXPORT wxPalette: public wxGDIObject
 public:
   wxPalette(void);
   inline wxPalette(const wxPalette& palette) { Ref(palette); }
 public:
   wxPalette(void);
   inline wxPalette(const wxPalette& palette) { Ref(palette); }

-  inline wxPalette(const wxPalette* palette) { /* UnRef(); */ if (palette) Ref(*palette); }

 
 

-  wxPalette(const int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
+  wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);

   ~wxPalette(void);
   ~wxPalette(void);

-  bool Create(const int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
+  bool Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);

   int GetPixel(const unsigned char red, const unsigned char green, const unsigned char blue) const;
   int GetPixel(const unsigned char red, const unsigned char green, const unsigned char blue) const;

-  bool GetRGB(const int pixel, unsigned char *red, unsigned char *green, unsigned char *blue) const;
+  bool GetRGB(int pixel, unsigned char *red, unsigned char *green, unsigned char *blue) const;

 
   virtual bool Ok(void) const { return (m_refData != NULL) ; }
 
 
   virtual bool Ok(void) const { return (m_refData != NULL) ; }
 


@@ -63,4 +62,4 @@ public:
 #define wxColourMap wxPalette
 
 #endif
 #define wxColourMap wxPalette
 
 #endif

-    // __PALETTEH__
+    // _WX_PALETTE_H_