Fix FILETIME <-> wxDateTime conversions while DST is in effect in wxMSW.

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

diff --git a/src/x11/palette.cpp b/src/x11/palette.cpp
index aa81fd4ae08d4440f66156fb252e94ea7be05c8f..dc3f06801defddfbbadb7bb3b0e16685eb767b24 100644 (file)
--- a/src/x11/palette.cpp
+++ b/src/x11/palette.cpp
@@ -41,11 +41,10 @@ not the functionality that wxPalette::Create() aims to provide.
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"

+    #include "wx/utils.h"
+    #include "wx/window.h"

 #endif
 
 #endif
 

-#include "wx/window.h"
-#include "wx/utils.h"
-

 #ifdef __VMS__
 #pragma message disable nosimpint
 #endif
 #ifdef __VMS__
 #pragma message disable nosimpint
 #endif


@@ -78,7 +77,7 @@ wxPaletteRefData::wxPaletteRefData()
 
 wxPaletteRefData::~wxPaletteRefData()
 {
 
 wxPaletteRefData::~wxPaletteRefData()
 {

-    Display *display = (Display*) NULL;
+    Display *display = NULL;

 
     wxList::compatibility_iterator node, next;
 
 
     wxList::compatibility_iterator node, next;
 


@@ -171,7 +170,22 @@ bool wxPalette::Create(int n, const unsigned char *red, const unsigned char *gre
     return true;
 }
 
     return true;
 }
 

-int wxPalette::GetPixel(unsigned char red, unsigned char green, unsigned char blue) const
+wxGDIRefData *wxPalette::CreateGDIRefData() const
+{
+    return new wxPaletteRefData;
+}
+
+wxGDIRefData *
+wxPalette::CloneGDIRefData(const wxGDIRefData * WXUNUSED(data)) const
+{
+    wxFAIL_MSG( wxS("Cloning palettes is not implemented in wxX11.") );
+
+    return new wxPaletteRefData;
+}
+
+int wxPalette::GetPixel(unsigned char WXUNUSED(red),
+                        unsigned char WXUNUSED(green),
+                        unsigned char WXUNUSED(blue)) const

 {
     if ( !m_refData )
         return wxNOT_FOUND;
 {
     if ( !m_refData )
         return wxNOT_FOUND;