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

removed overloaded virtual InitWith() methods, keep just a single InitRGBA()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41123 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-09-10 02:00:24 +00:00
parent 9d639ffa59
commit aea95b1c3a
19 changed files with 75 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/cocoa/colour.h
View File

@@ -83,10 +83,8 @@ protected:
// puts the object in an invalid, uninitialized state
void Init();
virtual void InitWith(unsigned char red,
unsigned char green,
unsigned char blue,
unsigned char alpha);
virtual void
InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
private:
WX_NSColor m_cocoaNSColor;

73
include/wx/colour.h
View File

@@ -21,8 +21,8 @@
// Set() is a virtual function and thus cannot be called by wxColourBase
// constructors
#define DEFINE_STD_WXCOLOUR_CONSTRUCTORS \
wxColour( unsigned char red, unsigned char green, unsigned char blue, \
unsigned char alpha = wxALPHA_OPAQUE ) \
wxColour( ChannelType red, ChannelType green, ChannelType blue, \
ChannelType alpha = wxALPHA_OPAQUE ) \
{ Set(red, green, blue, alpha); } \
wxColour( unsigned long colRGB ) { Set(colRGB); } \
wxColour(const wxString &colourName) { Set(colourName); } \
@@ -47,19 +47,10 @@ const unsigned char wxALPHA_OPAQUE = 0xff;
class WXDLLEXPORT wxColourBase : public wxGDIObject
{
protected:
virtual void InitWith(unsigned char red, unsigned char green, unsigned char blue) = 0;
// this will be overridden in alpha supporting classes
virtual void InitWith(unsigned char red, unsigned char green, unsigned char blue, unsigned char WXUNUSED(alpha))
{
InitWith( red, green, blue ) ;
}
virtual bool FromString(const wxChar *);
public:
// type of a single colour component
typedef unsigned char ChannelType;
wxColourBase() {}
virtual ~wxColourBase() {}
@@ -67,23 +58,26 @@ public:
// Set() functions
// ---------------
void Set(unsigned char red, unsigned char green, unsigned char blue, unsigned char alpha = wxALPHA_OPAQUE)
{ InitWith(red,green,blue, alpha); }
void Set(ChannelType red,
ChannelType green,
ChannelType blue,
ChannelType alpha = wxALPHA_OPAQUE)
{ InitRGBA(red,green,blue, alpha); }
// implemented in colourcmn.cpp
bool Set(const wxChar *str)
{ return FromString(str); }
bool Set(const wxString &str)
{ return Set((const wxChar *)str); }
{ return FromString(str); }
void Set(unsigned long colRGB)
{
// we don't need to know sizeof(long) here because we assume that the three
// least significant bytes contain the R, G and B values
Set((unsigned char)colRGB,
(unsigned char)(colRGB >> 8),
(unsigned char)(colRGB >> 16));
Set((ChannelType)colRGB,
(ChannelType)(colRGB >> 8),
(ChannelType)(colRGB >> 16));
}
@@ -93,10 +87,10 @@ public:
virtual bool Ok() const = 0;
virtual unsigned char Red() const = 0;
virtual unsigned char Green() const = 0;
virtual unsigned char Blue() const = 0;
virtual unsigned char Alpha() const
virtual ChannelType Red() const = 0;
virtual ChannelType Green() const = 0;
virtual ChannelType Blue() const = 0;
virtual ChannelType Alpha() const
{ return wxALPHA_OPAQUE ; }
// implemented in colourcmn.cpp
@@ -111,35 +105,40 @@ public:
wxDEPRECATED( static wxColour CreateByName(const wxString& name) );
wxDEPRECATED( void InitFromName(const wxString& col) );
#endif
protected:
virtual void
InitRGBA(ChannelType r, ChannelType g, ChannelType b, ChannelType a) = 0;
virtual bool FromString(const wxChar *s);
};
#if defined(__WXPALMOS__)
#include "wx/generic/colour.h"
#include "wx/generic/colour.h"
#elif defined(__WXMSW__)
#include "wx/msw/colour.h"
#include "wx/msw/colour.h"
#elif defined(__WXMOTIF__)
#include "wx/motif/colour.h"
#include "wx/motif/colour.h"
#elif defined(__WXGTK20__)
#include "wx/gtk/colour.h"
#include "wx/gtk/colour.h"
#elif defined(__WXGTK__)
#include "wx/gtk1/colour.h"
#include "wx/gtk1/colour.h"
#elif defined(__WXMGL__)
#include "wx/generic/colour.h"
#include "wx/generic/colour.h"
#elif defined(__WXDFB__)
#include "wx/generic/colour.h"
#include "wx/generic/colour.h"
#elif defined(__WXX11__)
#include "wx/x11/colour.h"
#include "wx/x11/colour.h"
#elif defined(__WXMAC__)
#include "wx/mac/colour.h"
#include "wx/mac/colour.h"
#elif defined(__WXCOCOA__)
#include "wx/cocoa/colour.h"
#include "wx/cocoa/colour.h"
#elif defined(__WXPM__)
#include "wx/os2/colour.h"
#include "wx/os2/colour.h"
#endif
#define wxColor wxColour
#endif
// _WX_COLOUR_H_BASE_
#endif // _WX_COLOUR_H_BASE_

8
include/wx/generic/colour.h
View File

@@ -57,12 +57,8 @@ protected:
// Helper function
void Init();
virtual void InitWith(unsigned char red, unsigned char green, unsigned char blue)
{
InitWith(red, green, blue, wxALPHA_OPAQUE);
}
virtual void InitWith(unsigned char red, unsigned char green, unsigned char blue, unsigned char alpha);
virtual void
InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
private:
bool m_isInit;

4
include/wx/gtk/colour.h
View File

@@ -48,8 +48,10 @@ public:
#endif
protected:
virtual void
InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
virtual bool FromString(const wxChar *str);
virtual void InitWith( unsigned char red, unsigned char green, unsigned char blue );
private:
DECLARE_DYNAMIC_CLASS(wxColour)

3
include/wx/gtk1/colour.h
View File

@@ -65,7 +65,8 @@ protected:
virtual wxObjectRefData *CreateRefData() const;
virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
virtual void InitWith( unsigned char red, unsigned char green, unsigned char blue );
virtual void
InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
private:
DECLARE_DYNAMIC_CLASS(wxColour)

10
include/wx/mac/carbon/colour.h
View File

@@ -55,12 +55,8 @@ protected :
// Helper function
void Init();
void InitWith( unsigned char red, unsigned char green, unsigned char blue )
{
InitWith( red, green, blue , wxALPHA_OPAQUE ) ;
}
void InitWith( unsigned char red, unsigned char green, unsigned char blue, unsigned char alpha );
virtual void
InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
private:
bool m_isInit;
@@ -72,7 +68,7 @@ private:
public:
WXCOLORREF m_pixel ;
void FromRGBColor( const WXCOLORREF* color ) ;
private:
DECLARE_DYNAMIC_CLASS(wxColour)

3
include/wx/motif/colour.h
View File

@@ -62,7 +62,8 @@ protected:
// Helper function
void Init();
virtual void InitWith( unsigned char red, unsigned char green, unsigned char blue );
virtual void
InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
private:
bool m_isInit;

3
include/wx/msw/colour.h
View File

@@ -63,7 +63,8 @@ protected:
// Helper function
void Init();
virtual void InitWith(unsigned char red, unsigned char green, unsigned char blue);
virtual void
InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
private:
bool m_isInit;

3
include/wx/os2/colour.h
View File

@@ -65,7 +65,8 @@ private:
unsigned char m_cBlue;
unsigned char m_cGreen;
virtual void InitWith( unsigned char cRed, unsigned char cGreen, unsigned char cBlue);
virtual void
InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
public:
WXCOLORREF m_vPixel ;

4
include/wx/x11/colour.h
View File

@@ -64,8 +64,10 @@ protected:
virtual wxObjectRefData *CreateRefData() const;
virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
virtual void
InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
virtual bool FromString(const wxChar *str);
virtual void InitWith( unsigned char red, unsigned char green, unsigned char blue );
private:
DECLARE_DYNAMIC_CLASS(wxColour)

2
src/cocoa/colour.mm
View File

@@ -63,7 +63,7 @@ wxColour::~wxColour ()
[m_cocoaNSColor release];
}
void wxColour::InitWith(unsigned char r,
void wxColour::InitRGBA(unsigned char r,
unsigned char g,
unsigned char b,
unsigned char a)

4
src/generic/colour.cpp
View File

@@ -59,7 +59,9 @@ wxColour::~wxColour()
{
}
void wxColour::InitWith(unsigned char r, unsigned char g, unsigned char b,
void wxColour::InitRGBA(unsigned char r,
unsigned char g,
unsigned char b,
unsigned char a)
{
m_red = r;

3
src/gtk/colour.cpp
View File

@@ -112,7 +112,8 @@ bool wxColour::operator == ( const wxColour& col ) const
refData->m_blue == that_refData->m_blue;
}
void wxColour::InitWith( unsigned char red, unsigned char green, unsigned char blue )
void wxColour::InitRGBA(unsigned char red, unsigned char green, unsigned char blue,
unsigned char WXUNUSED(alpha))
{
UnRef();

3
src/gtk1/colour.cpp
View File

@@ -169,7 +169,8 @@ wxObjectRefData *wxColour::CloneRefData(const wxObjectRefData *data) const
return new wxColourRefData(*(wxColourRefData *)data);
}
void wxColour::InitWith( unsigned char red, unsigned char green, unsigned char blue )
void wxColour::InitRGBA(unsigned char red, unsigned char green, unsigned char blue,
unsigned char WXUNUSED(alpha))
{
AllocExclusive();

2
src/mac/carbon/colour.cpp
View File

@@ -44,7 +44,7 @@ wxColour::~wxColour ()
{
}
void wxColour::InitWith (unsigned char r, unsigned char g, unsigned char b, unsigned char a)
void wxColour::InitRGBA (unsigned char r, unsigned char g, unsigned char b, unsigned char a)
{
m_red = r;
m_green = g;

3
src/motif/colour.cpp
View File

@@ -64,7 +64,8 @@ wxColour::~wxColour()
{
}
void wxColour::InitWith(unsigned char r, unsigned char g, unsigned char b)
void wxColour::InitRGBA(unsigned char r, unsigned char g, unsigned char b,
unsigned char WXUNUSED(a))
{
m_red = r;
m_green = g;

3
src/msw/colour.cpp
View File

@@ -77,7 +77,8 @@ wxColour::~wxColour()
{
}
void wxColour::InitWith(unsigned char r, unsigned char g, unsigned char b)
void wxColour::InitRGBA(unsigned char r, unsigned char g, unsigned char b,
unsigned char WXUNUSED(a))
{
m_red = r;
m_green = g;

5
src/os2/colour.cpp
View File

@@ -57,9 +57,10 @@ wxColour::~wxColour()
{
} // end of wxColour::~wxColour
void wxColour::InitWith( unsigned char cRed,
void wxColour::InitRGBA( unsigned char cRed,
unsigned char cGreen,
unsigned char cBlue )
unsigned char cBlue,
unsigned char WXUNUSED(calpha) )
{
m_cRed = cRed;
m_cGreen = cGreen;

3
src/x11/colour.cpp
View File

@@ -172,7 +172,8 @@ wxObjectRefData *wxColour::CloneRefData(const wxObjectRefData *data) const
return new wxColourRefData(*(wxColourRefData *)data);
}
void wxColour::InitWith( unsigned char red, unsigned char green, unsigned char blue )
void wxColour::InitRGBA(unsigned char red, unsigned char green, unsigned char blue,
unsigned char WXUNUSED(alpha))
{
AllocExclusive();