X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e64df9bcc331d49d05a6dc7729ee08071e4c6408..2209baaee3a8578450e204593b79ed155f340f68:/include/wx/colour.h

diff --git a/include/wx/colour.h b/include/wx/colour.h
index a8d4381599..4de29da610 100644
--- a/include/wx/colour.h
+++ b/include/wx/colour.h
@@ -1,12 +1,117 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/colour.h
+// Purpose:     wxColourBase definition
+// Author:      Julian Smart
+// Modified by: Francesco Montorsi
+// Created:
+// RCS-ID:      $Id$
+// Copyright:   Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
 #ifndef _WX_COLOUR_H_BASE_
 #define _WX_COLOUR_H_BASE_
 
-#if defined(__WXMSW__)
+#include "wx/defs.h"
+#include "wx/gdiobj.h"
+
+
+// the standard wxColour constructor.
+// this macro avoids to repeat these lines across all colour.h files, since
+// Set() is a virtual function and thus cannot be called by wxColourBase
+// constructors
+#define DEFINE_STD_WXCOLOUR_CONSTRUCTORS                                        \
+    wxColour( unsigned char red, unsigned char green, unsigned char blue )      \
+        { Set(red, green, blue); }                                              \
+    wxColour( unsigned long colRGB ) { Set(colRGB); }                           \
+    wxColour(const wxString &colourName) { Set(colourName); }                   \
+    wxColour(const wxChar *colourName) { Set(colourName); }
+
+
+// for wxString <-> wxColour
+#define wxC2S_NAME              1   // return colour name, when possible
+#define wxC2S_CSS_SYNTAX        2   // return colour in rgb(r,g,b) syntax
+#define wxC2S_HTML_SYNTAX       4   // return colour in #rrggbb syntax
+
+
+class WXDLLEXPORT wxColour;
+
+
+//-----------------------------------------------------------------------------
+// wxColourBase: this class has no data members, just some functions to avoid
+//               code redundancy in all native wxColour implementations
+//-----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxColourBase : public wxGDIObject
+{
+protected:
+
+    virtual void InitWith(unsigned char red, unsigned char green, unsigned char blue) = 0;
+    virtual bool FromString(const wxChar *);
+
+public:
+    wxColourBase() {}
+    virtual ~wxColourBase() {}
+
+
+    // Set() functions
+    // ---------------
+
+    void Set(unsigned char red, unsigned char green, unsigned char blue)
+        { InitWith(red,green,blue); }
+
+    // implemented in colourcmn.cpp
+    bool Set(const wxChar *str)
+        { return FromString(str); }
+
+    bool Set(const wxString &str)
+        { return Set((const wxChar *)str); }
+
+    void Set(unsigned long colRGB)
+    {
+        // 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
+        Set((unsigned char)colRGB,
+            (unsigned char)(colRGB >> 8),
+            (unsigned char)(colRGB >> 16));
+    }
+
+
+
+    // accessors
+    // ---------
+
+    virtual bool Ok() const = 0;
+
+    virtual unsigned char Red() const = 0;
+    virtual unsigned char Green() const = 0;
+    virtual unsigned char Blue() const = 0;
+
+    // implemented in colourcmn.cpp
+    virtual wxString GetAsString(long flags = wxC2S_NAME | wxC2S_CSS_SYNTAX) const;
+
+
+
+    // old, deprecated
+    // ---------------
+
+    static wxColour CreateByName(const wxString& name);
+    void InitFromName(const wxString& col)
+        { Set(col); }
+};
+
+
+
+#if defined(__WXPALMOS__)
+#include "wx/palmos/colour.h"
+#elif defined(__WXMSW__)
 #include "wx/msw/colour.h"
 #elif defined(__WXMOTIF__)
 #include "wx/motif/colour.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
 #include "wx/gtk/colour.h"
+#elif defined(__WXGTK__)
+#include "wx/gtk1/colour.h"
 #elif defined(__WXMGL__)
 #include "wx/mgl/colour.h"
 #elif defined(__WXX11__)