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

diff --git a/include/wx/generic/paletteg.h b/include/wx/generic/paletteg.h
new file mode 100644 (file)
index 0000000..9e63395
--- /dev/null
+++ b/include/wx/generic/paletteg.h
@@ -0,0 +1,59 @@
+/////////////////////////////////////////////////////////////////////////////
+// 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 __WX_PALETTEG_H__
+#define __WX_PALETTEG_H__
+
+#ifdef __GNUG__
+#pragma interface "paletteg.h"
+#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 // __WX_PALETTEG_H__

diff --git a/include/wx/gtk/palette.h b/include/wx/gtk/palette.h
deleted file mode 100644 (file)
index 8574526..0000000
--- a/include/wx/gtk/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__

diff --git a/include/wx/gtk1/palette.h b/include/wx/gtk1/palette.h
deleted file mode 100644 (file)
index 8574526..0000000
--- 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__