Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moved gtk/palette.h to generic/paletteg.h

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9851 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-04-22 22:24:37 +00:00
parent 0046ff7c4f
commit ce113d5ffe
2 changed files with 4 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/gtk/palette.h → include/wx/generic/paletteg.h
View File

@@ -9,11 +9,11 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef __GTKPALETTEH__ #ifndef __WX_PALETTEG_H__
#define __GTKPALETTEH__ #define __WX_PALETTEG_H__
#ifdef __GNUG__ #ifdef __GNUG__
#pragma interface #pragma interface "paletteg.h"
#endif #endif
#include "wx/defs.h" #include "wx/defs.h"
@@ -56,4 +56,4 @@ class wxPalette: public wxGDIObject
#define wxColorMap wxPalette #define wxColorMap wxPalette
#define wxColourMap wxPalette #define wxColourMap wxPalette
#endif // __GTKPALETTEH__ #endif // __WX_PALETTEG_H__

59
include/wx/gtk1/palette.h
View File

@@ -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__