s/Chiniese/Chinese/g

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

diff --git a/include/wx/msw/colour.h b/include/wx/msw/colour.h
index 4770bf7a53ba58ac5b0ad757289efb65979bae5a..56ef566d8585c1c629674291e8d9c5681d04469b 100644 (file)
--- a/include/wx/msw/colour.h
+++ b/include/wx/msw/colour.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

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

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


@@ -15,6 +15,7 @@
 #ifdef __GNUG__
 #pragma interface "colour.h"
 #endif
 #ifdef __GNUG__
 #pragma interface "colour.h"
 #endif

+#include "wx/object.h"

 
 // Colour
 class WXDLLEXPORT wxColour: public wxObject
 
 // Colour
 class WXDLLEXPORT wxColour: public wxObject


@@ -25,13 +26,15 @@ public:
   wxColour();
     // from RGB
   wxColour( unsigned char red, unsigned char green, unsigned char blue );
   wxColour();
     // from RGB
   wxColour( unsigned char red, unsigned char green, unsigned char blue );

+  wxColour( unsigned long colRGB ) { Set(colRGB); }
+

     // 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 wxChar *colourName ) { InitFromName(colourName); }
+

 
     // copy ctors and assignment operators
   wxColour( const wxColour& col );
 
     // copy ctors and assignment operators
   wxColour( const wxColour& col );

-  wxColour( const wxColour* col );

   wxColour& operator = ( const wxColour& col );
 
     // dtor
   wxColour& operator = ( const wxColour& col );
 
     // dtor


@@ -61,18 +64,23 @@ 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_isInit == colour.m_isInit &&
+           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); }

 
   WXCOLORREF GetPixel() const { return m_pixel; };
 
 
   WXCOLORREF GetPixel() const { return m_pixel; };
 

+public:
+  WXCOLORREF m_pixel;
+

 private:
 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;


@@ -80,12 +88,9 @@ private:
   // helper func
   void InitFromName(const wxString& colourName);
 
   // helper func
   void InitFromName(const wxString& colourName);
 

-public:
-  WXCOLORREF m_pixel ;
-

 private:
   DECLARE_DYNAMIC_CLASS(wxColour)
 };
 
 #endif
 private:
   DECLARE_DYNAMIC_CLASS(wxColour)
 };
 
 #endif

-       // _WX_COLOUR_H_
+        // _WX_COLOUR_H_