projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Patch #826420, and also adapted to new SWIG
[wxWidgets.git]
/
include
/
wx
/
gtk1
/
colour.h
diff --git
a/include/wx/gtk1/colour.h
b/include/wx/gtk1/colour.h
index e399d074b27af718fec1eb9b7a9b06356701ccd2..87b7e7a3b0636bf1ee9a76669c87332020205404 100644
(file)
--- a/
include/wx/gtk1/colour.h
+++ b/
include/wx/gtk1/colour.h
@@
-11,7
+11,7
@@
#ifndef __GTKCOLOURH__
#define __GTKCOLOURH__
#ifndef __GTKCOLOURH__
#define __GTKCOLOURH__
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface
#endif
#pragma interface
#endif
@@
-47,7
+47,11
@@
public:
// Implicit conversion from the colour name
wxColour( const wxString &colourName ) { InitFromName(colourName); }
// Implicit conversion from the colour name
wxColour( const wxString &colourName ) { InitFromName(colourName); }
- wxColour( const char *colourName ) { InitFromName(colourName); }
+ wxColour( const char *colourName ) { InitFromName( wxString::FromAscii(colourName) ); }
+#if wxUSE_UNICODE
+ wxColour( const wxChar *colourName ) { InitFromName( wxString(colourName) ); }
+#endif
+
wxColour( const wxColour& col )
: wxGDIObject()
wxColour( const wxColour& col )
: wxGDIObject()
@@
-76,6
+80,9
@@
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;
// Implementation part
void CalcPixel( GdkColormap *cmap );
int GetPixel() const;