Fix wxHtmlHelpData::SetTempDir() to behave correctly without trailing slash.

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

diff --git a/src/x11/palette.cpp b/src/x11/palette.cpp
index 79f27675560330046fae2b18d023e8cb86311fb1..09ecbae93f02b0116416d25fb1e3b1538e1ed5a8 100644 (file)
--- a/src/x11/palette.cpp
+++ b/src/x11/palette.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
-// RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -77,7 +76,7 @@ wxPaletteRefData::wxPaletteRefData()
 
 wxPaletteRefData::~wxPaletteRefData()
 {
-    Display *display = (Display*) NULL;
+    Display *display = NULL;
 
     wxList::compatibility_iterator node, next;
 
@@ -175,9 +174,12 @@ wxGDIRefData *wxPalette::CreateGDIRefData() const
     return new wxPaletteRefData;
 }
 
-wxGDIRefData *wxPalette::CloneGDIRefData(const wxGDIRefData *data) const
+wxGDIRefData *
+wxPalette::CloneGDIRefData(const wxGDIRefData * WXUNUSED(data)) const
 {
-    return new wxPaletteRefData(*wx_static_cast(const wxPaletteRefData *, data));
+    wxFAIL_MSG( wxS("Cloning palettes is not implemented in wxX11.") );
+
+    return new wxPaletteRefData;
 }
 
 int wxPalette::GetPixel(unsigned char WXUNUSED(red),