projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use IMPLEMENT_APP_CONSOLE and not IMPLEMENT_APP for console apps
[wxWidgets.git]
/
src
/
gtk
/
colour.cpp
diff --git
a/src/gtk/colour.cpp
b/src/gtk/colour.cpp
index afb1cdc00e130600a3e9437957e5a4993f94ba38..b2bb1b993a194809351ea0b9e40ccd354981252f 100644
(file)
--- a/
src/gtk/colour.cpp
+++ b/
src/gtk/colour.cpp
@@
-20,19
+20,23
@@
// wxColour
//-----------------------------------------------------------------------------
// wxColour
//-----------------------------------------------------------------------------
-class wxColourRefData
: public wxObject
RefData
+class wxColourRefData
: public wxGDI
RefData
{
public:
{
public:
- wxColourRefData(guint16 red, guint16 green, guint16 blue)
+ wxColourRefData(guint16 red, guint16 green, guint16 blue
, guint16 alpha
)
{
{
+ m_color.red =
m_red = red;
m_red = red;
+ m_color.green =
m_green = green;
m_green = green;
+ m_color.blue =
m_blue = blue;
m_blue = blue;
+ m_alpha = alpha;
m_color.pixel = 0;
m_colormap = NULL;
}
m_color.pixel = 0;
m_colormap = NULL;
}
- ~wxColourRefData()
+
virtual
~wxColourRefData()
{
FreeColour();
}
{
FreeColour();
}
@@
-46,6
+50,7
@@
public:
guint16 m_red;
guint16 m_green;
guint16 m_blue;
guint16 m_red;
guint16 m_green;
guint16 m_blue;
+ guint16 m_alpha;
DECLARE_NO_COPY_CLASS(wxColourRefData)
};
DECLARE_NO_COPY_CLASS(wxColourRefData)
};
@@
-87,7
+92,7
@@
IMPLEMENT_DYNAMIC_CLASS(wxColour,wxGDIObject)
wxColour::wxColour(const GdkColor& gdkColor)
{
wxColour::wxColour(const GdkColor& gdkColor)
{
- m_refData = new wxColourRefData(gdkColor.red, gdkColor.green, gdkColor.blue);
+ m_refData = new wxColourRefData(gdkColor.red, gdkColor.green, gdkColor.blue
, 0xFFFF /*opaque alpha in 16 bit*/
);
}
wxColour::~wxColour()
}
wxColour::~wxColour()
@@
-106,17
+111,20
@@
bool wxColour::operator == ( const wxColour& col ) const
wxColourRefData* that_refData = wx_static_cast(wxColourRefData*, col.m_refData);
return refData->m_red == that_refData->m_red &&
refData->m_green == that_refData->m_green &&
wxColourRefData* that_refData = wx_static_cast(wxColourRefData*, col.m_refData);
return refData->m_red == that_refData->m_red &&
refData->m_green == that_refData->m_green &&
- refData->m_blue == that_refData->m_blue;
+ refData->m_blue == that_refData->m_blue &&
+ refData->m_alpha == that_refData->m_alpha;
}
}
-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 alpha)
{
UnRef();
m_refData = new wxColourRefData(
(guint16(red) << SHIFT) + red,
(guint16(green) << SHIFT) + green,
{
UnRef();
m_refData = new wxColourRefData(
(guint16(red) << SHIFT) + red,
(guint16(green) << SHIFT) + green,
- (guint16(blue) << SHIFT) + blue);
+ (guint16(blue) << SHIFT) + blue,
+ (guint16(alpha) << SHIFT) + alpha);
}
unsigned char wxColour::Red() const
}
unsigned char wxColour::Red() const
@@
-140,6
+148,13
@@
unsigned char wxColour::Blue() const
return wxByte(M_COLDATA->m_blue >> SHIFT);
}
return wxByte(M_COLDATA->m_blue >> SHIFT);
}
+unsigned char wxColour::Alpha() const
+{
+ wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );
+
+ return wxByte(M_COLDATA->m_alpha >> SHIFT);
+}
+
void wxColour::CalcPixel( GdkColormap *cmap )
{
if (!Ok()) return;
void wxColour::CalcPixel( GdkColormap *cmap )
{
if (!Ok()) return;
@@
-161,7
+176,7
@@
const GdkColor *wxColour::GetColor() const
return &M_COLDATA->m_color;
}
return &M_COLDATA->m_color;
}
-bool wxColour::FromString(const wx
Char *
str)
+bool wxColour::FromString(const wx
String&
str)
{
GdkColor colGDK;
if ( gdk_color_parse( wxGTK_CONV_SYS( str ), &colGDK ) )
{
GdkColor colGDK;
if ( gdk_color_parse( wxGTK_CONV_SYS( str ), &colGDK ) )