Correction for wxFileConfig where UNIX was taken

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

diff --git a/include/wx/motif/palette.h b/include/wx/motif/palette.h
index 589b7735e03dd1eb2811d70b39752a3d69d61b21..b40831a8942f18d2a1f98ec0ef352db4295dc37c 100644 (file)
--- a/include/wx/motif/palette.h
+++ b/include/wx/motif/palette.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PALETTE_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PALETTE_H_


@@ -55,8 +55,7 @@ class WXDLLEXPORT wxPalette: public wxGDIObject
 
 public:
   wxPalette();
 
 public:
   wxPalette();

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

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


@@ -66,9 +65,9 @@ public:
 
   virtual bool Ok() const { return (m_refData != NULL) ; }
 
 
   virtual bool Ok() 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; }
+  wxPalette& operator = (const wxPalette& palette) { if (*this == palette) return (*this); Ref(palette); return *this; }
+  bool operator == (const wxPalette& palette) const { return m_refData == palette.m_refData; }
+  bool operator != (const wxPalette& palette) const { return m_refData != palette.m_refData; }

 
   // Motif-specific
   WXColormap GetXColormap(WXDisplay* display = NULL) const;
 
   // Motif-specific
   WXColormap GetXColormap(WXDisplay* display = NULL) const;