Use an enum for the colour/string conversion flags

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66249 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/colour.h b/include/wx/colour.h
index e3dd34ee801e85b0799eb5e32725d7a7223b3db0..3de95570f11792d121f27a45ca365f4fcfe2cdef 100644 (file)
--- a/include/wx/colour.h
+++ b/include/wx/colour.h
@@ -35,10 +35,11 @@ class WXDLLIMPEXP_FWD_CORE wxColour;
 
 
 // flags for wxColour -> wxString conversion (see wxColour::GetAsString)
 
 
 // flags for wxColour -> wxString conversion (see wxColour::GetAsString)

-#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
-
+enum {
+    wxC2S_NAME             = 1,   // return colour name, when possible
+    wxC2S_CSS_SYNTAX       = 2,   // return colour in rgb(r,g,b) syntax
+    wxC2S_HTML_SYNTAX      = 4    // return colour in #rrggbb syntax
+};

 
 const unsigned char wxALPHA_TRANSPARENT = 0;
 const unsigned char wxALPHA_OPAQUE = 0xff;
 
 const unsigned char wxALPHA_TRANSPARENT = 0;
 const unsigned char wxALPHA_OPAQUE = 0xff;

diff --git a/interface/wx/colour.h b/interface/wx/colour.h
index 68d62f3f69288cc9e8594a182bab0c6fd4f02458..a0176ab1cc85d4fc8175498f7c0571888afa4150 100644 (file)
--- a/interface/wx/colour.h
+++ b/interface/wx/colour.h
@@ -13,12 +13,16 @@
 
     @{
 */
 
     @{
 */

-#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.
+enum {
+    wxC2S_NAME             = 1,   // return colour name, when possible
+    wxC2S_CSS_SYNTAX       = 2,   // return colour in rgb(r,g,b) syntax
+    wxC2S_HTML_SYNTAX      = 4    // return colour in #rrggbb syntax
+};

 
 //@}
 
 
 //@}
 

+const unsigned char wxALPHA_TRANSPARENT = 0;
+const unsigned char wxALPHA_OPAQUE = 0xff;

 
 /**
     @class wxColour
 
 /**
     @class wxColour


@@ -78,6 +82,12 @@ public:
     */
     wxColour(const wxString& colourName);
 
     */
     wxColour(const wxString& colourName);
 

+    /**
+        @param colRGB
+            A packed RGB value.
+    */
+    wxColour(unsigned long colRGB);
+    

     /**
         Copy constructor.
     */
     /**
         Copy constructor.
     */


@@ -155,7 +165,7 @@ public:
         On X, an allocated pixel value is returned.
         If the pixel is invalid (on X, unallocated), @c -1 is returned.
     */
         On X, an allocated pixel value is returned.
         If the pixel is invalid (on X, unallocated), @c -1 is returned.
     */

-    int GetPixel() const;
+    wxIntPtr GetPixel() const;

 
     /**
         Returns the green intensity.
 
     /**
         Returns the green intensity.