projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wxMultiChoiceDialog uses now wxCheckListBox if possible, wxListBox if not
[wxWidgets.git]
/
src
/
mgl
/
colour.cpp
diff --git
a/src/mgl/colour.cpp
b/src/mgl/colour.cpp
index 9eaf41f563aec351f27913d6dc2cc4a597978906..feae373c8a9469eecc7b9af6926829b3395a25be 100644
(file)
--- a/
src/mgl/colour.cpp
+++ b/
src/mgl/colour.cpp
@@
-1,18
+1,14
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: colour.cpp
+// Name:
src/mgl/
colour.cpp
// Purpose: wxColour class
// Author: Julian Smart
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Purpose: wxColour class
// Author: Julian Smart
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
+// Licence:
wxWindows licence
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "colour.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
@@
-27,54
+23,47
@@
IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
// Colour
// Colour
-
wxColour::wxColour
()
+
void wxColour::Init
()
{
{
- m_red = m_blue = m_green = 0;
- m_isInit = FALSE;
+ m_red =
+ m_blue =
+ m_green = 0;
+ m_isInit = false;
}
}
-wxColour::wxColour(
unsigned char r, unsigned char g, unsigned char b
)
+wxColour::wxColour()
{
{
- m_red = r;
- m_green = g;
- m_blue = b;
- m_isInit = TRUE;
+ Init();
}
wxColour::wxColour(const wxColour& col)
{
}
wxColour::wxColour(const wxColour& col)
{
- m_red = col.m_red;
- m_green = col.m_green;
- m_blue = col.m_blue;
- m_isInit = col.m_isInit;
+ *this = col;
}
wxColour& wxColour::operator =(const wxColour& col)
{
}
wxColour& wxColour::operator =(const wxColour& col)
{
- m_red = col.m_red;
- m_green = col.m_green;
- m_blue = col.m_blue;
- m_isInit = col.m_isInit;
- return *this;
+
m_red = col.m_red;
+
m_green = col.m_green;
+
m_blue = col.m_blue;
+
m_isInit = col.m_isInit;
+
return *this;
}
}
-void wxColour::InitFromName(const wxString&
col
)
+void wxColour::InitFromName(const wxString&
name
)
{
{
- wxColour *the_colour = wxTheColourDatabase->FindColour (col);
- if (the_colour)
+ if ( wxTheColourDatabase )
{
{
- m_red = the_colour->Red();
- m_green = the_colour->Green();
- m_blue = the_colour->Blue();
- m_isInit = TRUE;
- }
- else
- {
- m_red = 0;
- m_green = 0;
- m_blue = 0;
- m_isInit = FALSE;
+ wxColour col = wxTheColourDatabase->Find(name);
+ if ( col.Ok() )
+ {
+ *this = col;
+ return;
+ }
}
}
+
+ // leave invalid
+ Init();
}
wxColour::~wxColour()
}
wxColour::~wxColour()
@@
-83,8
+72,8
@@
wxColour::~wxColour()
void wxColour::Set(unsigned char r, unsigned char g, unsigned char b)
{
void wxColour::Set(unsigned char r, unsigned char g, unsigned char b)
{
- m_red = r;
- m_green = g;
- m_blue = b;
-
m_isInit = TRUE
;
+
m_red = r;
+
m_green = g;
+
m_blue = b;
+
m_isInit = true
;
}
}