projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
revert memory leak fix, it causes crash
[wxWidgets.git]
/
include
/
wx
/
generic
/
paletteg.h
diff --git
a/include/wx/generic/paletteg.h
b/include/wx/generic/paletteg.h
index 0799841995f00cbedd986312eeca1080374da514..6ae9287a914c316a0cb386d52338ce4641098e87 100644
(file)
--- a/
include/wx/generic/paletteg.h
+++ b/
include/wx/generic/paletteg.h
@@
-1,10
+1,10
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name:
palette
.h
+// Name:
wx/generic/paletteg
.h
// Purpose:
// Author: Robert Roebling
// Created: 01/02/97
// Purpose:
// Author: Robert Roebling
// Created: 01/02/97
-//
Id:
-// Copyright: (c) 1998 Robert Roebling
, Julian Smart and Markus Holzem
+//
RCS-ID: $Id$
+// Copyright: (c) 1998 Robert Roebling
and Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@
-12,10
+12,6
@@
#ifndef __WX_PALETTEG_H__
#define __WX_PALETTEG_H__
#ifndef __WX_PALETTEG_H__
#define __WX_PALETTEG_H__
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "paletteg.h"
-#endif
-
#include "wx/defs.h"
#include "wx/object.h"
#include "wx/gdiobj.h"
#include "wx/defs.h"
#include "wx/object.h"
#include "wx/gdiobj.h"
@@
-25,35
+21,29
@@
// classes
//-----------------------------------------------------------------------------
// classes
//-----------------------------------------------------------------------------
-class wxPalette;
+class
WXDLLIMPEXP_CORE
wxPalette;
//-----------------------------------------------------------------------------
// wxPalette
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
// wxPalette
//-----------------------------------------------------------------------------
-class
wxPalette: public wxGDIObject
+class
WXDLLIMPEXP_CORE wxPalette: public wxPaletteBase
{
{
- DECLARE_DYNAMIC_CLASS(wxPalette)
-
- public:
-
+public:
wxPalette();
wxPalette( int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue );
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;
+ virtual ~wxPalette();
+ virtual bool Ok() const { return IsOk(); }
+ virtual bool IsOk() const;
bool Create( int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
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;
+ int GetPixel(
unsigned char red, unsigned char green,
unsigned char blue ) const;
bool GetRGB( int pixel, unsigned char *red, unsigned char *green, unsigned char *blue ) const;
bool GetRGB( int pixel, unsigned char *red, unsigned char *green, unsigned char *blue ) const;
- // no data
-};
+ virtual int GetColoursCount() const;
-#define wxColorMap wxPalette
-#define wxColourMap wxPalette
+private:
+ DECLARE_DYNAMIC_CLASS(wxPalette)
+};
#endif // __WX_PALETTEG_H__
#endif // __WX_PALETTEG_H__