From ce113d5ffec01244cb96ab3d9fbd2619c3f6766f Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= <vslavik@fastmail.fm>
Date: Sun, 22 Apr 2001 22:24:37 +0000
Subject: [PATCH] moved gtk/palette.h to generic/paletteg.h

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9851 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 .../wx/{gtk/palette.h => generic/paletteg.h}  |  8 +--
 include/wx/gtk1/palette.h                     | 59 -------------------
 2 files changed, 4 insertions(+), 63 deletions(-)
 rename include/wx/{gtk/palette.h => generic/paletteg.h} (93%)
 delete mode 100644 include/wx/gtk1/palette.h

diff --git a/include/wx/gtk/palette.h b/include/wx/generic/paletteg.h
similarity index 93%
rename from include/wx/gtk/palette.h
rename to include/wx/generic/paletteg.h
index 8574526cb3..9e63395c3d 100644
--- a/include/wx/gtk/palette.h
+++ b/include/wx/generic/paletteg.h
@@ -9,11 +9,11 @@
 /////////////////////////////////////////////////////////////////////////////
 
 
-#ifndef __GTKPALETTEH__
-#define __GTKPALETTEH__
+#ifndef __WX_PALETTEG_H__
+#define __WX_PALETTEG_H__
 
 #ifdef __GNUG__
-#pragma interface
+#pragma interface "paletteg.h"
 #endif
 
 #include "wx/defs.h"
@@ -56,4 +56,4 @@ class wxPalette: public wxGDIObject
 #define wxColorMap wxPalette
 #define wxColourMap wxPalette
 
-#endif // __GTKPALETTEH__
+#endif // __WX_PALETTEG_H__
diff --git a/include/wx/gtk1/palette.h b/include/wx/gtk1/palette.h
deleted file mode 100644
index 8574526cb3..0000000000
--- a/include/wx/gtk1/palette.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        palette.h
-// Purpose:
-// Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-
-#ifndef __GTKPALETTEH__
-#define __GTKPALETTEH__
-
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/gdiobj.h"
-#include "wx/gdicmn.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxPalette;
-
-//-----------------------------------------------------------------------------
-// wxPalette
-//-----------------------------------------------------------------------------
-
-class wxPalette: public wxGDIObject
-{
-  DECLARE_DYNAMIC_CLASS(wxPalette)
-
-  public:
-
-    wxPalette();
-    wxPalette( int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue );
-    wxPalette( const wxPalette& palette );
-    ~wxPalette();
-    wxPalette& operator = ( const wxPalette& palette );
-    bool operator == ( const wxPalette& palette );
-    bool operator != ( const wxPalette& palette );
-    bool Ok() const;
-
-    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;
-    bool GetRGB( int pixel, unsigned char *red, unsigned char *green, unsigned char *blue ) const;
-
-    // no data
-};
-
-#define wxColorMap wxPalette
-#define wxColourMap wxPalette
-
-#endif // __GTKPALETTEH__
-- 
2.47.2