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

wxColour source cleaning. Corrections to 'const unsigned char' within wxColour docs.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35801 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-10-05 16:22:44 +00:00
parent 6e21a3db8a
commit edc536d358
20 changed files with 213 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
docs/latex/wx/colour.tex
View File

@@ -1,3 +1,14 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% Name: colour.tex
%% Purpose: wxColour docs
%% Author:
%% Modified by:
%% Created:
%% RCS-ID: $Id$
%% Copyright: (c) wxWidgets
%% License: wxWindows license
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\section{\class{wxColour}}\label{wxcolour} \section{\class{wxColour}}\label{wxcolour}
A colour is an object representing a combination of Red, Green, and Blue (RGB) intensity values, A colour is an object representing a combination of Red, Green, and Blue (RGB) intensity values,
@@ -47,7 +58,7 @@ wxLIGHT\_GREY}
Default constructor. Default constructor.
\func{}{wxColour}{\param{const unsigned char}{ red}, \param{const unsigned char}{ green}, \param{const unsigned char}{ blue}} \func{}{wxColour}{\param{unsigned char}{ red}, \param{unsigned char}{ green}, \param{unsigned char}{ blue}}
Constructs a colour from red, green and blue values. Constructs a colour from red, green and blue values.
@@ -125,7 +136,7 @@ Returns the red intensity.
\membersection{wxColour::Set}\label{wxcolourset} \membersection{wxColour::Set}\label{wxcolourset}
\func{void}{Set}{\param{const unsigned char}{ red}, \param{const unsigned char}{ green}, \param{const unsigned char}{ blue}} \func{void}{Set}{\param{unsigned char}{ red}, \param{unsigned char}{ green}, \param{unsigned char}{ blue}}
Sets the RGB intensity values. Sets the RGB intensity values.

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

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: colour.h // Name: wx/cocoa/colour.h
// Purpose: wxColour class // Purpose: wxColour class
// Author: David Elliott // Author: David Elliott
// Modified by: // Modified by:
@@ -21,12 +21,18 @@
class WXDLLEXPORT wxColour: public wxObject class WXDLLEXPORT wxColour: public wxObject
{ {
public: public:
// constructors
// ------------
// default
wxColour() { Init(); } wxColour() { Init(); }
// from RGB // from separate RGB
wxColour( unsigned char red, unsigned char green, unsigned char blue ) wxColour( unsigned char red, unsigned char green, unsigned char blue )
: m_cocoaNSColor(NULL) : m_cocoaNSColor(NULL)
{ Set(red,green,blue); } { Set(red,green,blue); }
// from packed RGB
wxColour( unsigned long colRGB ) wxColour( unsigned long colRGB )
: m_cocoaNSColor(NULL) : m_cocoaNSColor(NULL)
{ Set(colRGB); } { Set(colRGB); }

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

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: colour.h // Name: wx/gtk/colour.h
// Purpose: // Purpose:
// Author: Robert Roebling // Author: Robert Roebling
// Id: $Id$ // Id: $Id$
@@ -34,10 +34,16 @@ class WXDLLIMPEXP_CORE wxColour;
class WXDLLIMPEXP_CORE wxColour: public wxGDIObject class WXDLLIMPEXP_CORE wxColour: public wxGDIObject
{ {
public: public:
// constructors
// ------------
// default
wxColour() { } wxColour() { }
// Construct from RGB // from separate RGB
wxColour( unsigned char red, unsigned char green, unsigned char blue ); wxColour( unsigned char red, unsigned char green, unsigned char blue );
// from packed RGB
wxColour( unsigned long colRGB ) { Set(colRGB); } wxColour( unsigned long colRGB ) { Set(colRGB); }
// Implicit conversion from the colour name // Implicit conversion from the colour name

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

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: colour.h // Name: wx/gtk/colour.h
// Purpose: // Purpose:
// Author: Robert Roebling // Author: Robert Roebling
// Id: $Id$ // Id: $Id$
@@ -34,10 +34,16 @@ class WXDLLIMPEXP_CORE wxColour;
class WXDLLIMPEXP_CORE wxColour: public wxGDIObject class WXDLLIMPEXP_CORE wxColour: public wxGDIObject
{ {
public: public:
// constructors
// ------------
// default
wxColour() { } wxColour() { }
// Construct from RGB // from separate RGB
wxColour( unsigned char red, unsigned char green, unsigned char blue ); wxColour( unsigned char red, unsigned char green, unsigned char blue );
// from packed RGB
wxColour( unsigned long colRGB ) { Set(colRGB); } wxColour( unsigned long colRGB ) { Set(colRGB); }
// Implicit conversion from the colour name // Implicit conversion from the colour name

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

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: colour.h // Name: wx/mac/carbon/colour.h
// Purpose: wxColour class // Purpose: wxColour class
// Author: Stefan Csomor // Author: Stefan Csomor
// Modified by: // Modified by:
@@ -19,57 +19,62 @@
class WXDLLEXPORT wxColour: public wxObject class WXDLLEXPORT wxColour: public wxObject
{ {
public: public:
// ctors // constructors
// ------------
// default // default
wxColour() { Init(); } wxColour() { Init(); }
// from RGB
wxColour( unsigned char red, unsigned char green, unsigned char blue ) // from separate RGB
{ Set(red, green, blue); } wxColour( unsigned char red, unsigned char green, unsigned char blue )
wxColour( unsigned long colRGB ) { Set(red, green, blue); }
{ Set(colRGB); }
// from packed RGB
wxColour( unsigned long colRGB )
{ Set(colRGB); }
// implicit conversion from the colour name // implicit conversion from the colour name
wxColour( const wxString &colourName ) wxColour( const wxString &colourName )
{ InitFromName(colourName); } { InitFromName(colourName); }
wxColour( const wxChar *colourName ) wxColour( const wxChar *colourName )
{ InitFromName(colourName); } { InitFromName(colourName); }
// copy ctors and assignment operators // copy ctors and assignment operators
wxColour( const wxColour& col ); wxColour( const wxColour& col );
wxColour& operator = ( const wxColour& col ); wxColour& operator = ( const wxColour& col );
// dtor // dtor
~wxColour(); ~wxColour();
// Set() functions // Set() functions
void Set( unsigned char red, unsigned char green, unsigned char blue ); void Set( unsigned char red, unsigned char green, unsigned char blue );
void Set( unsigned long colRGB ) void Set( unsigned long colRGB )
{ {
// we don't need to know sizeof(long) here because we assume that the three // 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 // least significant bytes contain the R, G and B values
Set((unsigned char)colRGB, Set((unsigned char)colRGB,
(unsigned char)(colRGB >> 8), (unsigned char)(colRGB >> 8),
(unsigned char)(colRGB >> 16)); (unsigned char)(colRGB >> 16));
} }
// accessors // accessors
bool Ok() const {return m_isInit; } bool Ok() const {return m_isInit; }
unsigned char Red() const { return m_red; } unsigned char Red() const { return m_red; }
unsigned char Green() const { return m_green; } unsigned char Green() const { return m_green; }
unsigned char Blue() const { return m_blue; } unsigned char Blue() const { return m_blue; }
// comparison // comparison
bool operator == (const wxColour& colour) const bool operator == (const wxColour& colour) const
{ {
return (m_isInit == colour.m_isInit return (m_isInit == colour.m_isInit
&& m_red == colour.m_red && m_red == colour.m_red
&& m_green == colour.m_green && m_green == colour.m_green
&& m_blue == colour.m_blue); && m_blue == colour.m_blue);
} }
bool operator != (const wxColour& colour) const { return !(*this == colour); } bool operator != (const wxColour& colour) const { return !(*this == colour); }
const WXCOLORREF& GetPixel() const { return m_pixel; }; const WXCOLORREF& GetPixel() const { return m_pixel; };
void InitFromName(const wxString& col); void InitFromName(const wxString& col);
@@ -79,17 +84,17 @@ protected :
void Init(); void Init();
private: private:
bool m_isInit; bool m_isInit;
unsigned char m_red; unsigned char m_red;
unsigned char m_blue; unsigned char m_blue;
unsigned char m_green; unsigned char m_green;
public: public:
WXCOLORREF m_pixel ; WXCOLORREF m_pixel ;
void Set( const WXCOLORREF* color ) ; void Set( const WXCOLORREF* color ) ;
private: private:
DECLARE_DYNAMIC_CLASS(wxColour) DECLARE_DYNAMIC_CLASS(wxColour)
}; };
#endif #endif

101
include/wx/mac/classic/colour.h
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: colour.h // Name: wx/mac/classic/colour.h
// Purpose: wxColour class // Purpose: wxColour class
// Author: Stefan Csomor // Author: Stefan Csomor
// Modified by: // Modified by:
@@ -19,58 +19,63 @@
class WXDLLEXPORT wxColour: public wxObject class WXDLLEXPORT wxColour: public wxObject
{ {
public: public:
// ctors // constructors
// ------------
// default // default
wxColour() { Init(); } wxColour() { Init(); }
// from RGB
wxColour( unsigned char red, unsigned char green, unsigned char blue ) // from separate RGB
{ Set(red, green, blue); } wxColour( unsigned char red, unsigned char green, unsigned char blue )
wxColour( unsigned long colRGB ) { Set(red, green, blue); }
{ Set(colRGB); }
// from packed RGB
wxColour( unsigned long colRGB )
{ Set(colRGB); }
// implicit conversion from the colour name // implicit conversion from the colour name
wxColour( const wxString &colourName ) wxColour( const wxString &colourName )
{ InitFromName(colourName); } { InitFromName(colourName); }
wxColour( const wxChar *colourName ) wxColour( const wxChar *colourName )
{ InitFromName(colourName); } { InitFromName(colourName); }
// copy ctors and assignment operators // copy ctors and assignment operators
wxColour( const wxColour& col ); wxColour( const wxColour& col );
wxColour( const wxColour* col ); wxColour( const wxColour* col );
wxColour& operator = ( const wxColour& col ); wxColour& operator = ( const wxColour& col );
// dtor // dtor
~wxColour(); ~wxColour();
// Set() functions // Set() functions
void Set( unsigned char red, unsigned char green, unsigned char blue ); void Set( unsigned char red, unsigned char green, unsigned char blue );
void Set( unsigned long colRGB ) void Set( unsigned long colRGB )
{ {
// we don't need to know sizeof(long) here because we assume that the three // 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 // least significant bytes contain the R, G and B values
Set((unsigned char)colRGB, Set((unsigned char)colRGB,
(unsigned char)(colRGB >> 8), (unsigned char)(colRGB >> 8),
(unsigned char)(colRGB >> 16)); (unsigned char)(colRGB >> 16));
} }
// accessors // accessors
bool Ok() const {return m_isInit; } bool Ok() const {return m_isInit; }
unsigned char Red() const { return m_red; } unsigned char Red() const { return m_red; }
unsigned char Green() const { return m_green; } unsigned char Green() const { return m_green; }
unsigned char Blue() const { return m_blue; } unsigned char Blue() const { return m_blue; }
// comparison // comparison
bool operator == (const wxColour& colour) const bool operator == (const wxColour& colour) const
{ {
return (m_isInit == colour.m_isInit return (m_isInit == colour.m_isInit
&& m_red == colour.m_red && m_red == colour.m_red
&& m_green == colour.m_green && m_green == colour.m_green
&& m_blue == colour.m_blue); && m_blue == colour.m_blue);
} }
bool operator != (const wxColour& colour) const { return !(*this == colour); } bool operator != (const wxColour& colour) const { return !(*this == colour); }
const WXCOLORREF& GetPixel() const { return m_pixel; }; const WXCOLORREF& GetPixel() const { return m_pixel; };
void InitFromName(const wxString& col); void InitFromName(const wxString& col);
@@ -80,17 +85,17 @@ protected :
void Init(); void Init();
private: private:
bool m_isInit; bool m_isInit;
unsigned char m_red; unsigned char m_red;
unsigned char m_blue; unsigned char m_blue;
unsigned char m_green; unsigned char m_green;
public: public:
WXCOLORREF m_pixel ; WXCOLORREF m_pixel ;
void Set( const WXCOLORREF* color ) ; void Set( const WXCOLORREF* color ) ;
private: private:
DECLARE_DYNAMIC_CLASS(wxColour) DECLARE_DYNAMIC_CLASS(wxColour)
}; };
#endif #endif

37
include/wx/mgl/colour.h
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: colour.h // Name: wx/mgl/colour.h
// Purpose: wxColour class // Purpose: wxColour class
// Author: Julian Smart // Author: Julian Smart
// Modified by: // Modified by:
@@ -18,35 +18,40 @@
class WXDLLEXPORT wxColour: public wxObject class WXDLLEXPORT wxColour: public wxObject
{ {
public: public:
// ctors // constructors
// default // ------------
// default
wxColour(); wxColour();
// from RGB
// from separate RGB
wxColour(unsigned char red, unsigned char green, unsigned char blue) wxColour(unsigned char red, unsigned char green, unsigned char blue)
{ Set(red, green, blue); } { Set(red, green, blue); }
// from packed RGB
wxColour(unsigned long colRGB) { Set(colRGB); } wxColour(unsigned long colRGB) { Set(colRGB); }
// implicit conversion from the colour name // implicit conversion from the colour name
wxColour(const wxString &colourName) { InitFromName(colourName); } wxColour(const wxString &colourName) { InitFromName(colourName); }
wxColour(const char *colourName) { InitFromName(colourName); } wxColour(const char *colourName) { InitFromName(colourName); }
// copy ctors and assignment operators // copy ctors and assignment operators
wxColour(const wxColour& col); wxColour(const wxColour& col);
wxColour& operator = (const wxColour& col); wxColour& operator = (const wxColour& col);
// dtor // dtor
~wxColour(); ~wxColour();
// Set() functions // Set() functions
void Set(unsigned char red, unsigned char green, unsigned char blue); void Set(unsigned char red, unsigned char green, unsigned char blue);
void Set(unsigned long colRGB) void Set(unsigned long colRGB)
{ {
// we don't need to know sizeof(long) here because we assume that the three // 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 // least significant bytes contain the R, G and B values
Set((unsigned char)colRGB, Set((unsigned char)colRGB,
(unsigned char)(colRGB >> 8), (unsigned char)(colRGB >> 8),
(unsigned char)(colRGB >> 16)); (unsigned char)(colRGB >> 16));
} }
// accessors // accessors
@@ -59,10 +64,10 @@ public:
// comparison // comparison
bool operator == (const wxColour& colour) const bool operator == (const wxColour& colour) const
{ {
return (m_red == colour.m_red && return (m_red == colour.m_red &&
m_green == colour.m_green && m_green == colour.m_green &&
m_blue == colour.m_blue && m_blue == colour.m_blue &&
m_isInit == colour.m_isInit); m_isInit == colour.m_isInit);
} }
bool operator != (const wxColour& colour) const { return !(*this == colour); } bool operator != (const wxColour& colour) const { return !(*this == colour); }

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

@@ -1,12 +1,12 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: colour.h // Name: wx/motif/colour.h
// Purpose: wxColour class // Purpose: wxColour class
// Author: Julian Smart // Author: Julian Smart
// Modified by: // Modified by:
// Created: 17/09/98 // Created: 17/09/98
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) Julian Smart // Copyright: (c) Julian Smart
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef _WX_COLOUR_H_ #ifndef _WX_COLOUR_H_
@@ -20,12 +20,17 @@ class WXDLLEXPORT wxColour : public wxObject
{ {
DECLARE_DYNAMIC_CLASS(wxColour) DECLARE_DYNAMIC_CLASS(wxColour)
public: public:
// ctors // constructors
// ------------
// default // default
wxColour(); wxColour();
// from RGB
// from separate RGB
wxColour( unsigned char red, unsigned char green, unsigned char blue ) wxColour( unsigned char red, unsigned char green, unsigned char blue )
{ Set(red, green, blue); } { Set(red, green, blue); }
// from packed RGB
wxColour( unsigned long colRGB ) { Set(colRGB); } wxColour( unsigned long colRGB ) { Set(colRGB); }
// implicit conversion from the colour name // implicit conversion from the colour name

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

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: colour.h // Name: wx/os2/colour.h
// Purpose: wxColour class // Purpose: wxColour class
// Author: David Webster // Author: David Webster
// Modified by: // Modified by:
@@ -18,56 +18,36 @@
class WXDLLEXPORT wxColour: public wxObject class WXDLLEXPORT wxColour: public wxObject
{ {
public: public:
// // constructors
// Ctors // ------------
//
// // default
// Default
//
wxColour(); wxColour();
// // from separate RGB
// from RGB wxColour( unsigned char cRed, unsigned char cGreen, unsigned char cBlue );
//
wxColour( unsigned char cRed
,unsigned char cGreen
,unsigned char cBlue
);
// from packed RGB
wxColour( unsigned long colRGB ) { Set(colRGB); } wxColour( unsigned long colRGB ) { Set(colRGB); }
//
// Implicit conversion from the colour name // Implicit conversion from the colour name
//
wxColour(const wxString& rColourName) { InitFromName(rColourName); } wxColour(const wxString& rColourName) { InitFromName(rColourName); }
wxColour(const wxChar *zColourName) { InitFromName(zColourName); } wxColour(const wxChar *zColourName) { InitFromName(zColourName); }
//
// Copy ctors and assignment operators // Copy ctors and assignment operators
//
wxColour(const wxColour& rCol); wxColour(const wxColour& rCol);
wxColour(const wxColour* pCol); wxColour(const wxColour* pCol);
wxColour&operator = (const wxColour& rCol); wxColour&operator = (const wxColour& rCol);
//
// Dtor // Dtor
//
~wxColour(); ~wxColour();
//
// Set functions // Set functions
// void Set( unsigned char cRed, unsigned char cGreen, unsigned char cBlue);
void Set( unsigned char cRed void Set( unsigned long lColRGB)
,unsigned char cGreen
,unsigned char cBlue
);
void Set(unsigned long lColRGB)
{ {
//
// We don't need to know sizeof(long) here because we assume that the three // 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 // least significant bytes contain the R, G and B values
//
Set( (unsigned char)lColRGB Set( (unsigned char)lColRGB
,(unsigned char)(lColRGB >> 8) ,(unsigned char)(lColRGB >> 8)
,(unsigned char)(lColRGB >> 16) ,(unsigned char)(lColRGB >> 16)
@@ -78,18 +58,14 @@ public:
InitFromName(rsColour); InitFromName(rsColour);
} }
//
// Accessors // Accessors
//
bool Ok(void) const {return m_bIsInit; } bool Ok(void) const {return m_bIsInit; }
unsigned char Red(void) const { return m_cRed; } unsigned char Red(void) const { return m_cRed; }
unsigned char Green(void) const { return m_cGreen; } unsigned char Green(void) const { return m_cGreen; }
unsigned char Blue(void) const { return m_cBlue; } unsigned char Blue(void) const { return m_cBlue; }
//
// Comparison // Comparison
//
bool operator == (const wxColour& rColour) const bool operator == (const wxColour& rColour) const
{ {
return (m_bIsInit == rColour.m_bIsInit return (m_bIsInit == rColour.m_bIsInit
@@ -118,7 +94,7 @@ private:
public: public:
WXCOLORREF m_vPixel ; WXCOLORREF m_vPixel ;
private: private:
DECLARE_DYNAMIC_CLASS(wxColour) DECLARE_DYNAMIC_CLASS(wxColour)
}; // end of class wxColour }; // end of class wxColour
#endif #endif

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

@@ -1,12 +1,12 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: colour.h // Name: wx/x11/colour.h
// Purpose: wxColour class // Purpose: wxColour class
// Author: Julian Smart, Robert Roebling // Author: Julian Smart, Robert Roebling
// Modified by: // Modified by:
// Created: 17/09/98 // Created: 17/09/98
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) Julian Smart, Robert Roebling // Copyright: (c) Julian Smart, Robert Roebling
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef _WX_COLOUR_H_ #ifndef _WX_COLOUR_H_
@@ -36,10 +36,16 @@ class WXDLLIMPEXP_CORE wxColour;
class WXDLLEXPORT wxColour: public wxGDIObject class WXDLLEXPORT wxColour: public wxGDIObject
{ {
public: public:
// constructors
// ------------
// default
wxColour() { } wxColour() { }
// Construct from RGB // from separate RGB
wxColour( unsigned char red, unsigned char green, unsigned char blue ); wxColour( unsigned char red, unsigned char green, unsigned char blue );
// from packed RGB
wxColour( unsigned long colRGB ) { Set(colRGB); } wxColour( unsigned long colRGB ) { Set(colRGB); }
// Implicit conversion from the colour name // Implicit conversion from the colour name
@@ -97,4 +103,3 @@ private:
#endif #endif
// _WX_COLOUR_H_ // _WX_COLOUR_H_

9
src/cocoa/colour.mm
View File

@@ -1,12 +1,12 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: colour.mm // Name: src/cococa/colour.mm
// Purpose: wxColour class // Purpose: wxColour class
// Author: David Elliott // Author: David Elliott
// Modified by: // Modified by:
// Created: 2003/06/17 // Created: 2003/06/17
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) 2003 David Elliott // Copyright: (c) 2003 David Elliott
// Licence: wxWidgets licence // Licence: wxWidgets licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#include "wx/wxprec.h" #include "wx/wxprec.h"
@@ -96,8 +96,7 @@ void wxColour::Set( WX_NSColor aColor )
unless the color was actually RGB to begin with it's likely that unless the color was actually RGB to begin with it's likely that
these will be fairly bogus. Particulary if the color is a pattern. */ these will be fairly bogus. Particulary if the color is a pattern. */
NSColor *rgbColor = [m_cocoaNSColor colorUsingColorSpaceName:NSCalibratedRGBColorSpace]; NSColor *rgbColor = [m_cocoaNSColor colorUsingColorSpaceName:NSCalibratedRGBColorSpace];
m_red = (wxUint8) ([rgbColor redComponent] * 255.0); m_red = (wxUint8) ([rgbColor redComponent] * 255.0);
m_green = (wxUint8) ([rgbColor greenComponent] * 255.0); m_green = (wxUint8) ([rgbColor greenComponent] * 255.0);
m_blue = (wxUint8) ([rgbColor blueComponent] * 255.0); m_blue = (wxUint8) ([rgbColor blueComponent] * 255.0);
} }

2
src/gtk/colour.cpp
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: colour.cpp // Name: src/gtk/colour.cpp
// Purpose: // Purpose:
// Author: Robert Roebling // Author: Robert Roebling
// Id: $Id$ // Id: $Id$

2
src/gtk1/colour.cpp
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: colour.cpp // Name: src/gtk/colour.cpp
// Purpose: // Purpose:
// Author: Robert Roebling // Author: Robert Roebling
// Id: $Id$ // Id: $Id$

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

@@ -1,12 +1,12 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: colour.cpp // Name: src/mac/carbon/colour.cpp
// Purpose: wxColour class // Purpose: wxColour class
// Author: Stefan Csomor // Author: Stefan Csomor
// Modified by: // Modified by:
// Created: 1998-01-01 // Created: 1998-01-01
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) Stefan Csomor // Copyright: (c) Stefan Csomor
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#include "wx/wxprec.h" #include "wx/wxprec.h"

4
src/mac/classic/colour.cpp
View File

@@ -1,12 +1,12 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: colour.cpp // Name: src/mac/classic/colour.cpp
// Purpose: wxColour class // Purpose: wxColour class
// Author: Stefan Csomor // Author: Stefan Csomor
// Modified by: // Modified by:
// Created: 1998-01-01 // Created: 1998-01-01
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) Stefan Csomor // Copyright: (c) Stefan Csomor
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#include "wx/gdicmn.h" #include "wx/gdicmn.h"

4
src/mgl/colour.cpp
View File

@@ -1,12 +1,12 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: colour.cpp // Name: src/mgl/colour.cpp
// Purpose: wxColour class // Purpose: wxColour class
// Author: Julian Smart // Author: Julian Smart
// Modified by: // Modified by:
// Created: 01/02/97 // Created: 01/02/97
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) Julian Smart // Copyright: (c) Julian Smart
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// For compilers that support precompilation, includes "wx.h". // For compilers that support precompilation, includes "wx.h".

3
src/msw/colour.cpp
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: colour.cpp // Name: src/msw/colour.cpp
// Purpose: wxColour class // Purpose: wxColour class
// Author: Julian Smart // Author: Julian Smart
// Modified by: // Modified by:
@@ -123,4 +123,3 @@ void wxColour::Set(unsigned char r, unsigned char g, unsigned char b)
m_isInit = true; m_isInit = true;
m_pixel = PALETTERGB(m_red, m_green, m_blue); m_pixel = PALETTERGB(m_red, m_green, m_blue);
} }

2
src/os2/colour.cpp
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: colour.cpp // Name: src/os2/colour.cpp
// Purpose: wxColour class // Purpose: wxColour class
// Author: David Webster // Author: David Webster
// Modified by: // Modified by:

5
src/palmos/colour.cpp
View File

@@ -106,5 +106,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;
} }

4
src/x11/colour.cpp
View File

@@ -1,12 +1,12 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: colour.cpp // Name: src/x11/colour.cpp
// Purpose: wxColour class // Purpose: wxColour class
// Author: Julian Smart, Robert Roebling // Author: Julian Smart, Robert Roebling
// Modified by: // Modified by:
// Created: 17/09/98 // Created: 17/09/98
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) Julian Smart, Robert Roebling // Copyright: (c) Julian Smart, Robert Roebling
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#include "wx/gdicmn.h" #include "wx/gdicmn.h"