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

wxPaletteBase introduction. wxPalette::GetColoursCount() in interface of all platforms. wxColourMap definition centralized and 2.4 only. Source cleaning.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30901 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-12-08 17:43:18 +00:00
parent 767e3be0fa
commit 917be7ed06
13 changed files with 94 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/wx/generic/paletteg.h
View File

@@ -31,7 +31,7 @@ class wxPalette;
// wxPalette
//-----------------------------------------------------------------------------
class wxPalette: public wxGDIObject
class wxPalette: public wxPaletteBase
{
DECLARE_DYNAMIC_CLASS(wxPalette)
@@ -44,7 +44,7 @@ class wxPalette: public wxGDIObject
wxPalette& operator = ( const wxPalette& palette );
bool operator == ( const wxPalette& palette );
bool operator != ( const wxPalette& palette );
bool Ok() const;
virtual 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;
@@ -53,7 +53,4 @@ class wxPalette: public wxGDIObject
// no data
};
#define wxColorMap wxPalette
#define wxColourMap wxPalette
#endif // __WX_PALETTEG_H__

6
include/wx/mac/carbon/palette.h
View File

@@ -24,7 +24,7 @@ class WXDLLEXPORT wxPalette;
class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData
{
DECLARE_NO_COPY_CLASS(wxPaletteRefData)
friend class WXDLLEXPORT wxPalette;
public:
wxPaletteRefData();
@@ -36,14 +36,14 @@ protected:
#define M_PALETTEDATA ((wxPaletteRefData *)m_refData)
class WXDLLEXPORT wxPalette: public wxGDIObject
class WXDLLEXPORT wxPalette: public wxPaletteBase
{
DECLARE_DYNAMIC_CLASS(wxPalette)
public:
wxPalette();
wxPalette(const wxPalette& palette)
: wxGDIObject()
: wxPaletteBase()
{ Ref(palette); }
wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);

6
include/wx/mac/classic/palette.h
View File

@@ -24,7 +24,7 @@ class WXDLLEXPORT wxPalette;
class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData
{
DECLARE_NO_COPY_CLASS(wxPaletteRefData)
friend class WXDLLEXPORT wxPalette;
public:
wxPaletteRefData();
@@ -36,14 +36,14 @@ protected:
#define M_PALETTEDATA ((wxPaletteRefData *)m_refData)
class WXDLLEXPORT wxPalette: public wxGDIObject
class WXDLLEXPORT wxPalette: public wxPaletteBase
{
DECLARE_DYNAMIC_CLASS(wxPalette)
public:
wxPalette();
wxPalette(const wxPalette& palette)
: wxGDIObject()
: wxPaletteBase()
{ Ref(palette); }
wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);

13
include/wx/mgl/palette.h
View File

@@ -32,7 +32,7 @@ struct palette_t;
// wxPalette
//-----------------------------------------------------------------------------
class WXDLLEXPORT wxPalette: public wxGDIObject
class WXDLLEXPORT wxPalette: public wxPaletteBase
{
DECLARE_DYNAMIC_CLASS(wxPalette)
@@ -44,21 +44,16 @@ public:
wxPalette& operator = (const wxPalette& palette);
bool operator == (const wxPalette& palette) const;
bool operator != (const wxPalette& palette) const;
bool Ok() const;
virtual 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;
// implementation
int GetColoursCount() const;
// FIXME_MGL -- make this method standard part of wx API
// FIXME_MGL -- create wxXXXBase classes for all GDI stuff (Vadim wants that)
virtual int GetColoursCount() const;
palette_t *GetMGLpalette_t() const;
};
#define wxColorMap wxPalette
#define wxColourMap wxPalette
#endif // __WX_PALETTE_H__

18
include/wx/motif/palette.h
View File

@@ -25,10 +25,10 @@ class WXDLLEXPORT wxPalette;
class wxXPalette : public wxObject
{
DECLARE_DYNAMIC_CLASS(wxXPalette)
public:
wxXPalette();
WXDisplay* m_display;
int m_pix_array_n;
unsigned long* m_pix_array;
@@ -42,33 +42,33 @@ class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData
public:
wxPaletteRefData();
~wxPaletteRefData();
protected:
wxList m_palettes;
};
#define M_PALETTEDATA ((wxPaletteRefData *)m_refData)
class WXDLLEXPORT wxPalette: public wxGDIObject
class WXDLLEXPORT wxPalette: public wxPaletteBase
{
DECLARE_DYNAMIC_CLASS(wxPalette)
public:
wxPalette();
wxPalette(const wxPalette& palette) { Ref(palette); }
wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
~wxPalette();
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;
virtual bool Ok() const { return (m_refData != NULL) ; }
wxPalette& operator = (const wxPalette& palette) { if (*this == palette) return (*this); Ref(palette); return *this; }
bool operator == (const wxPalette& palette) const { return m_refData == palette.m_refData; }
bool operator != (const wxPalette& palette) const { return m_refData != palette.m_refData; }
// Motif-specific
WXColormap GetXColormap(WXDisplay* display = NULL) const;
bool TransferBitmap(void *data, int depth, int size);

7
include/wx/msw/palette.h
View File

@@ -32,13 +32,13 @@ protected:
#define M_PALETTEDATA ((wxPaletteRefData *)m_refData)
class WXDLLEXPORT wxPalette: public wxGDIObject
class WXDLLEXPORT wxPalette: public wxPaletteBase
{
DECLARE_DYNAMIC_CLASS(wxPalette)
public:
wxPalette(void);
inline wxPalette(const wxPalette& palette) : wxGDIObject(palette) { Ref(palette); }
inline wxPalette(const wxPalette& palette) : wxPaletteBase(palette) { Ref(palette); }
wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
~wxPalette(void);
@@ -58,8 +58,5 @@ public:
void SetHPALETTE(WXHPALETTE pal);
};
#define wxColorMap wxPalette
#define wxColourMap wxPalette
#endif
// _WX_PALETTE_H_

7
include/wx/os2/palette.h
View File

@@ -30,7 +30,7 @@ public:
#define M_PALETTEDATA ((wxPaletteRefData *)m_refData)
class WXDLLEXPORT wxPalette: public wxGDIObject
class WXDLLEXPORT wxPalette: public wxPaletteBase
{
DECLARE_DYNAMIC_CLASS(wxPalette)
@@ -68,16 +68,13 @@ public:
inline bool operator != (const wxPalette& rPalette) const
{ return m_refData != rPalette.m_refData; }
virtual bool FreeResource(bool bForce = FALSE);
virtual bool FreeResource(bool bForce = false);
inline WXHPALETTE GetHPALETTE(void) const { return (M_PALETTEDATA ? M_PALETTEDATA->m_hPalette : 0); }
void SetHPALETTE(WXHPALETTE hPalette);
void SetPS(HPS hPS);
}; // end of CLASS wxPalette
#define wxColorMap wxPalette
#define wxColourMap wxPalette
#endif
// _WX_PALETTE_H_

25
include/wx/palette.h
View File

@@ -1,12 +1,26 @@
#ifndef _WX_PALETTE_H_BASE_
#define _WX_PALETTE_H_BASE_
// include it to get wxUSE_PALETTE value
#include "wx/setup.h"
#include "wx/defs.h"
#if wxUSE_PALETTE
#if defined(__WXMSW__)
#include "wx/object.h"
#include "wx/gdiobj.h"
// wxBrushBase
class WXDLLEXPORT wxPaletteBase: public wxGDIObject
{
public:
virtual ~wxPaletteBase() { }
virtual bool Ok() const = 0;
virtual int GetColoursCount() const { wxFAIL_MSG( _T("not implemented") ); return 0; };
};
#if defined(__PALMOS__)
#include "wx/palmos/palette.h"
#elif defined(__WXMSW__)
#include "wx/msw/palette.h"
#elif defined(__WXMOTIF__)
#include "wx/motif/palette.h"
@@ -22,6 +36,11 @@
#include "wx/os2/palette.h"
#endif
#if WXWIN_COMPATIBILITY_2_4
#define wxColorMap wxPalette
#define wxColourMap wxPalette
#endif
#endif // wxUSE_PALETTE
#endif

9
include/wx/palmos/palette.h
View File

@@ -4,7 +4,7 @@
// Author: William Osborne
// Modified by:
// Created: 10/13/04
// RCS-ID: $Id:
// RCS-ID: $Id:
// Copyright: (c) William Osborne
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@ -32,7 +32,7 @@ protected:
#define M_PALETTEDATA ((wxPaletteRefData *)m_refData)
class WXDLLEXPORT wxPalette: public wxGDIObject
class WXDLLEXPORT wxPalette: public wxPaletteBase
{
DECLARE_DYNAMIC_CLASS(wxPalette)
@@ -52,14 +52,11 @@ public:
inline bool operator == (const wxPalette& palette) const { return m_refData == palette.m_refData; }
inline bool operator != (const wxPalette& palette) const { return m_refData != palette.m_refData; }
virtual bool FreeResource(bool force = FALSE);
virtual bool FreeResource(bool force = false);
inline WXHPALETTE GetHPALETTE(void) const { return (M_PALETTEDATA ? M_PALETTEDATA->m_hPalette : 0); }
void SetHPALETTE(WXHPALETTE pal);
};
#define wxColorMap wxPalette
#define wxColourMap wxPalette
#endif
// _WX_PALETTE_H_

18
include/wx/x11/palette.h
View File

@@ -25,10 +25,10 @@ class WXDLLEXPORT wxPalette;
class wxXPalette : public wxObject
{
DECLARE_DYNAMIC_CLASS(wxXPalette)
public:
wxXPalette();
WXDisplay* m_display;
int m_pix_array_n;
unsigned long* m_pix_array;
@@ -42,33 +42,33 @@ class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData
public:
wxPaletteRefData();
~wxPaletteRefData();
protected:
wxList m_palettes;
};
#define M_PALETTEDATA ((wxPaletteRefData *)m_refData)
class WXDLLEXPORT wxPalette: public wxGDIObject
class WXDLLEXPORT wxPalette: public wxPaletteBase
{
DECLARE_DYNAMIC_CLASS(wxPalette)
public:
wxPalette();
wxPalette(const wxPalette& palette) { Ref(palette); }
wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
~wxPalette();
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;
virtual bool Ok() const { return (m_refData != NULL) ; }
wxPalette& operator = (const wxPalette& palette) { if (*this == palette) return (*this); Ref(palette); return *this; }
bool operator == (const wxPalette& palette) const { return m_refData == palette.m_refData; }
bool operator != (const wxPalette& palette) const { return m_refData != palette.m_refData; }
// X-specific
WXColormap GetXColormap(WXDisplay* display = NULL) const;
bool TransferBitmap(void *data, int depth, int size);