projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wxFileCtrl::Update was hiding wxWindow::Update
[wxWidgets.git]
/
src
/
os2
/
colour.cpp
diff --git
a/src/os2/colour.cpp
b/src/os2/colour.cpp
index fa7a6239700e0f0a9591cbf778389ae5e5e93a95..90469cec7279bff94e83cd09836574a7475d5ed8 100644
(file)
--- a/
src/os2/colour.cpp
+++ b/
src/os2/colour.cpp
@@
-23,83
+23,100
@@
IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
wxColour::wxColour ()
{
wxColour::wxColour ()
{
- m_
i
sInit = FALSE;
- m_
p
ixel = 0;
- m_
red = m_blue = m_g
reen = 0;
-}
+ m_
bI
sInit = FALSE;
+ m_
vP
ixel = 0;
+ m_
cRed = m_cBlue = m_cG
reen = 0;
+}
// end of wxColour::wxColour
-wxColour::wxColour (unsigned char r, unsigned char g, unsigned char b)
+wxColour::wxColour (
+ unsigned char cRed
+, unsigned char cGreen
+, unsigned char cBlue
+)
{
{
- m_
red = r
;
- m_
green = g
;
- m_
blue = b
;
- m_
i
sInit = TRUE;
-
// m_pixel = PALETTERGB (m_red, m_green, m_b
lue);
-}
+ m_
cRed = cRed
;
+ m_
cGreen = cGreen
;
+ m_
cBlue = cBlue
;
+ m_
bI
sInit = TRUE;
+
m_vPixel = OS2RGB (m_cRed, m_cGreen, m_cB
lue);
+}
// end of wxColour::wxColour
-wxColour::wxColour (const wxColour& col)
+wxColour::wxColour (
+ const wxColour& rCol
+)
{
{
- m_
red = col.m_r
ed;
- m_
green = col.m_g
reen;
- m_
blue = col.m_b
lue;
- m_
isInit = col.m_i
sInit;
- m_
pixel = col.m_p
ixel;
-}
+ m_
cRed = rCol.m_cR
ed;
+ m_
cGreen = rCol.m_cG
reen;
+ m_
cBlue = rCol.m_cB
lue;
+ m_
bIsInit = rCol.m_bI
sInit;
+ m_
vPixel = rCol.m_vP
ixel;
+}
// end of wxColour::wxColour
-wxColour& wxColour::operator =(const wxColour& col)
+wxColour& wxColour::operator =(
+ const wxColour& rCol
+)
{
{
-
m_red = col.m_r
ed;
-
m_green = col.m_g
reen;
-
m_blue = col.m_b
lue;
-
m_isInit = col.m_i
sInit;
-
m_pixel = col.m_p
ixel;
- return *this;
-}
+
m_cRed = rCol.m_cR
ed;
+
m_cGreen = rCol.m_cG
reen;
+
m_cBlue = rCol.m_cB
lue;
+
m_bIsInit = rCol.m_bI
sInit;
+
m_vPixel = rCol.m_vP
ixel;
+
return *this;
+}
// end of wxColour& wxColour::operator =
-void wxColour::InitFromName(const wxString& col)
+void wxColour::InitFromName(
+ const wxString& sCol
+)
{
{
- wxColour *the_colour = wxTheColourDatabase->FindColour (col);
- if (the_colour)
+ wxColour* pTheColour = wxTheColourDatabase->FindColour(sCol);
+
+ if (pTheColour)
{
{
- m_
red = the_colour->Red
();
- m_
green = the_colour->Green
();
- m_
blue = the_colour->Blue
();
- m_
i
sInit = TRUE;
+ m_
cRed = pTheColour->Red
();
+ m_
cGreen = pTheColour->Green
();
+ m_
cBlue = pTheColour->Blue
();
+ m_
bI
sInit = TRUE;
}
else
{
}
else
{
- m_
r
ed = 0;
- m_
g
reen = 0;
- m_
b
lue = 0;
- m_
i
sInit = FALSE;
+ m_
cR
ed = 0;
+ m_
cG
reen = 0;
+ m_
cB
lue = 0;
+ m_
bI
sInit = FALSE;
}
}
-/* TODO
- m_pixel = PALETTERGB (m_red, m_green, m_blue);
-*/
-}
+ m_vPixel = OS2RGB (m_cRed, m_cGreen, m_cBlue);
+} // end of wxColour::InitFromName
wxColour::~wxColour ()
{
wxColour::~wxColour ()
{
-}
+}
// end of wxColour::~wxColour
-void wxColour::Set (unsigned char r, unsigned char g, unsigned char b)
+void wxColour::Set (
+ unsigned char cRed
+, unsigned char cGreen
+, unsigned char cBlue
+)
{
{
- m_red = r;
- m_green = g;
- m_blue = b;
- m_isInit = TRUE;
-/* TODO
- m_pixel = PALETTERGB (m_red, m_green, m_blue);
-*/
-}
+ m_cRed = cRed;
+ m_cGreen = cGreen;
+ m_cBlue = cBlue;
+ m_bIsInit = TRUE;
+ m_vPixel = OS2RGB (m_cRed, m_cGreen, m_cBlue);
+} // end of wxColour::Set
+//
// Obsolete
// Obsolete
+//
#if WXWIN_COMPATIBILITY
#if WXWIN_COMPATIBILITY
-void wxColour::Get (unsigned char *r, unsigned char *g, unsigned char *b) const
+void wxColour::Get (
+ unsigned char* pRed
+, unsigned char* pGreen
+, unsigned char* pBlue
+) const
{
{
-
*r = m_r
ed;
-
*g = m_g
reen;
-
*b = m_b
lue;
-}
+
*Red = m_cR
ed;
+
*Green = m_cG
reen;
+
*Blue = m_cB
lue;
+}
// end of wxColour::Get
#endif
#endif