use wxTextEntry in wxTextValidator (modified patch 1821743)

[wxWidgets.git] / include / wx / cocoa / colour.h

diff --git a/include/wx/cocoa/colour.h b/include/wx/cocoa/colour.h
index 48986eb46ed9f4caa33bc68411243711274c31c6..dbdc52ae6279cff3bf4027cbe2cd037578c5a707 100644 (file)
--- a/include/wx/cocoa/colour.h
+++ b/include/wx/cocoa/colour.h
@@ -36,6 +36,8 @@ public:
         { Init(); Set(red, green, blue, alpha); }
     wxColour(unsigned long colRGB) { Init(); Set(colRGB); }
     wxColour(const wxString& colourName) { Init(); Set(colourName); }
         { Init(); Set(red, green, blue, alpha); }
     wxColour(unsigned long colRGB) { Init(); Set(colRGB); }
     wxColour(const wxString& colourName) { Init(); Set(colourName); }

+    wxColour(const char *colourName) { Init(); Set(colourName); }
+    wxColour(const wchar_t *colourName) { Init(); Set(colourName); }

 
     // initialization using existing NSColor
     wxColour( WX_NSColor aColor );
 
     // initialization using existing NSColor
     wxColour( WX_NSColor aColor );


@@ -48,7 +50,6 @@ public:
     virtual ~wxColour();
 
     // accessors
     virtual ~wxColour();
 
     // accessors

-    bool Ok() const { return IsOk(); }

     bool IsOk() const { return m_cocoaNSColor; }
     WX_NSColor GetNSColor() { return m_cocoaNSColor; }
 
     bool IsOk() const { return m_cocoaNSColor; }
     WX_NSColor GetNSColor() { return m_cocoaNSColor; }