changed removed wxToUpper to standard toupper

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

diff --git a/include/wx/stubs/colour.h b/include/wx/stubs/colour.h
index 0f592f578990e41e3435cedab7b67b52b4c0a845..24028b6756baf4926821d96666acaa1ccc8a9062 100644 (file)
--- a/include/wx/stubs/colour.h
+++ b/include/wx/stubs/colour.h
@@ -6,7 +6,7 @@
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COLOUR_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COLOUR_H_


@@ -27,7 +27,7 @@ public:
     // default
   wxColour();
     // from RGB
     // default
   wxColour();
     // from RGB

-  wxColour( char red, char green, char blue );
+  wxColour( unsigned char red, unsigned char green, unsigned char blue );

     // implicit conversion from the colour name
   wxColour( const wxString &colourName ) { InitFromName(colourName); }
   wxColour( const char *colourName ) { InitFromName(colourName); }
     // implicit conversion from the colour name
   wxColour( const wxString &colourName ) { InitFromName(colourName); }
   wxColour( const char *colourName ) { InitFromName(colourName); }


@@ -64,20 +64,22 @@ public:
   unsigned char Blue() const { return m_blue; }
 
   // comparison
   unsigned char Blue() const { return m_blue; }
 
   // comparison

-  bool operator == (const wxColour& colour)
+  bool operator == (const wxColour& colour) const

   {
     return (m_red == colour.m_red && 
             m_green == colour.m_green && 
             m_blue == colour.m_blue);
   }
   {
     return (m_red == colour.m_red && 
             m_green == colour.m_green && 
             m_blue == colour.m_blue);
   }

-  bool operator != (const wxColour& colour) { return !(*this == colour); }
+  bool operator != (const wxColour& colour) const { return !(*this == colour); }
+
+  void InitFromName(const wxString& col);

 
 /* TODO
   WXCOLORREF GetPixel() const { return m_pixel; };
 */
 
 private:
 
 /* TODO
   WXCOLORREF GetPixel() const { return m_pixel; };
 */
 
 private:

-  bool                             m_isInit;
+  bool          m_isInit;

   unsigned char m_red;
   unsigned char m_blue;
   unsigned char m_green;
   unsigned char m_red;
   unsigned char m_blue;
   unsigned char m_green;


@@ -92,4 +94,4 @@ private:
 };
 
 #endif
 };
 
 #endif

-       // _WX_COLOUR_H_
+  // _WX_COLOUR_H_