Fixed typo in my last commit (it did break socket detection code :-( ).

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

diff --git a/include/wx/msw/palette.h b/include/wx/msw/palette.h
index bddc8a334ce99cf78ca94196e6d1092977b0f433..3eaa3ac4ef4c0bd63fd5b478472832c60c337b6d 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,19 +39,18 @@ 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) ; }
 
   inline wxPalette& operator = (const wxPalette& palette) { if (*this == palette) return (*this); Ref(palette); return *this; }
 
   virtual bool Ok(void) const { return (m_refData != NULL) ; }
 
   inline wxPalette& operator = (const wxPalette& palette) { if (*this == palette) return (*this); Ref(palette); return *this; }

-  inline bool operator == (const wxPalette& palette) { return m_refData == palette.m_refData; }
-  inline bool operator != (const wxPalette& palette) { return m_refData != palette.m_refData; }
+  inline bool operator == (const wxPalette& palette) const { return m_refData == palette.m_refData; }
+  inline bool operator != (const wxPalette& palette) const { return m_refData != palette.m_refData; }

 
   virtual bool FreeResource(bool force = FALSE);
 
 
   virtual bool FreeResource(bool force = FALSE);
 


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

-    // __PALETTEH__
+    // _WX_PALETTE_H_