fixed a design flaw in wxFontMapper that prevented automatic creation of wxConfig...

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

diff --git a/include/wx/msw/colour.h b/include/wx/msw/colour.h
index b8f2270a4d2eb2116d8d12738f363bd5e6e43f15..d82c1dc1cf3a13f61f1dc4b7d5d9024ade7d3904 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,24 +15,33 @@
 #ifdef __GNUG__
 #pragma interface "colour.h"
 #endif
 #ifdef __GNUG__
 #pragma interface "colour.h"
 #endif

+#include "wx/object.h"

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

+  // ctors
+    // default

   wxColour();
   wxColour();

-  wxColour(const unsigned char r, const unsigned char g, const unsigned char b);
-  wxColour(unsigned long colRGB) { Set(colRGB); }
-  wxColour(const wxColour& col);
-  wxColour(const wxString& col) { InitFromName(col); }
-//  wxColour(const char *col) { InitFromName(col); }
-  ~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); }
+  wxColour( const char *colourName ) { InitFromName(colourName); }

 
 

-  wxColour& operator =(const wxColour& src) ;
-  wxColour& operator =(const wxString& src) ;
-  inline int Ok() const { return (m_isInit) ; }

 
 

-  void Set(unsigned char r, unsigned char g, unsigned char b);
+    // copy ctors and assignment operators
+  wxColour( const wxColour& col );
+  wxColour& operator = ( const wxColour& col );
+
+    // dtor
+  ~wxColour();
+
+  // Set() functions
+  void Set( unsigned char red, unsigned char green, unsigned char blue );

   void Set(unsigned long colRGB)
   {
     // we don't need to know sizeof(long) here because we assume that the three
   void Set(unsigned long colRGB)
   {
     // we don't need to know sizeof(long) here because we assume that the three


@@ -42,23 +51,36 @@ public:
         (unsigned char)(colRGB >> 16));
   }
 
         (unsigned char)(colRGB >> 16));
   }
 

+  // accessors
+  bool Ok() const {return m_isInit; }
+

   // Let's remove this inelegant function
 #if WXWIN_COMPATIBILITY
   void Get(unsigned char *r, unsigned char *g, unsigned char *b) const;
 #endif
 
   // Let's remove this inelegant function
 #if WXWIN_COMPATIBILITY
   void Get(unsigned char *r, unsigned char *g, unsigned char *b) const;
 #endif
 

-  inline unsigned char Red() const { return m_red; }
-  inline unsigned char Green() const { return m_green; }
-  inline unsigned char Blue() const { return m_blue; }
+  unsigned char Red() const { return m_red; }
+  unsigned char Green() const { return m_green; }
+  unsigned char Blue() const { return m_blue; }

 
 

-  inline bool operator == (const wxColour& colour) { return (m_red == colour.m_red && m_green == colour.m_green && m_blue == colour.m_blue); }
+  // comparison
+  bool operator==(const wxColour& colour) const
+  {
+    return m_isInit == colour.m_isInit &&
+           m_red == colour.m_red &&
+           m_green == colour.m_green &&
+           m_blue == colour.m_blue;
+  }

 
 

-  inline bool operator != (const wxColour& colour) { return (!(m_red == colour.m_red && m_green == colour.m_green && m_blue == colour.m_blue)); }
+  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;


@@ -66,14 +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)
 };
 
 private:
   DECLARE_DYNAMIC_CLASS(wxColour)
 };
 

-#define wxColor wxColour
-

 #endif
 #endif

-       // _WX_COLOUR_H_
+        // _WX_COLOUR_H_