projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added wxString::rbegin() and rend()
[wxWidgets.git]
/
include
/
wx
/
gtk
/
colour.h
diff --git
a/include/wx/gtk/colour.h
b/include/wx/gtk/colour.h
index e399d074b27af718fec1eb9b7a9b06356701ccd2..c575cc5435c2cfc0f18cccf329abd45abdd80091 100644
(file)
--- a/
include/wx/gtk/colour.h
+++ b/
include/wx/gtk/colour.h
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: colour.h
+// Name:
wx/gtk/
colour.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Purpose:
// Author: Robert Roebling
// Id: $Id$
@@
-7,14
+7,9
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-
#ifndef __GTKCOLOURH__
#define __GTKCOLOURH__
#ifndef __GTKCOLOURH__
#define __GTKCOLOURH__
-#ifdef __GNUG__
-#pragma interface
-#endif
-
#include "wx/defs.h"
#include "wx/object.h"
#include "wx/string.h"
#include "wx/defs.h"
#include "wx/object.h"
#include "wx/string.h"
@@
-25,39
+20,43
@@
// classes
//-----------------------------------------------------------------------------
// classes
//-----------------------------------------------------------------------------
-class wxDC;
-class wxPaintDC;
-class wxBitmap;
-class wxWindow;
+class
WXDLLIMPEXP_CORE
wxDC;
+class
WXDLLIMPEXP_CORE
wxPaintDC;
+class
WXDLLIMPEXP_CORE
wxBitmap;
+class
WXDLLIMPEXP_CORE
wxWindow;
-class wxColour;
+class
WXDLLIMPEXP_CORE
wxColour;
//-----------------------------------------------------------------------------
// wxColour
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
// wxColour
//-----------------------------------------------------------------------------
-class 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); }
// Implicit conversion from the colour name
wxColour( const wxString &colourName ) { InitFromName(colourName); }
wxColour( unsigned long colRGB ) { Set(colRGB); }
// Implicit conversion from the colour name
wxColour( const wxString &colourName ) { InitFromName(colourName); }
- wxColour( const char *colourName ) { InitFromName(colourName); }
-
- wxColour( const wxColour& col )
- : wxGDIObject()
- { Ref(col); }
- wxColour& operator = ( const wxColour& col ) { Ref(col); return *this; }
+ wxColour( const char *colourName ) { InitFromName( wxString::FromAscii(colourName) ); }
+#if wxUSE_UNICODE
+ wxColour( const wxChar *colourName ) { InitFromName( wxString(colourName) ); }
+#endif
~wxColour();
bool Ok() const { return m_refData != NULL; }
~wxColour();
bool Ok() const { return m_refData != NULL; }
-
+
bool operator == ( const wxColour& col ) const;
bool operator != ( const wxColour& col ) const { return !(*this == col); }
bool operator == ( const wxColour& col ) const;
bool operator != ( const wxColour& col ) const { return !(*this == col); }
@@
-76,18
+75,21
@@
public:
unsigned char Blue() const;
unsigned char Blue() const;
+ // Get colour from name or wxNullColour
+ static wxColour CreateByName(const wxString& name);
+
// Implementation part
void CalcPixel( GdkColormap *cmap );
int GetPixel() const;
GdkColor *GetColor() const;
// Implementation part
void CalcPixel( GdkColormap *cmap );
int GetPixel() const;
GdkColor *GetColor() const;
+ void InitFromName(const wxString& colourName);
+
protected:
// ref counting code
virtual wxObjectRefData *CreateRefData() const;
virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
protected:
// ref counting code
virtual wxObjectRefData *CreateRefData() const;
virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
-
- // Helper functions
- void InitFromName(const wxString& colourName);
+
private:
DECLARE_DYNAMIC_CLASS(wxColour)
private:
DECLARE_DYNAMIC_CLASS(wxColour)