Always use XPMs in this sample

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

diff --git a/include/wx/mac/colour.h b/include/wx/mac/colour.h
index a811708f72925205bb57787d9716b52350dd4a0a..158e631d644bddc4d514c4aefe7124e69b49eca4 100644 (file)
--- a/include/wx/mac/colour.h
+++ b/include/wx/mac/colour.h
@@ -1,18 +1,18 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        colour.h
 // Purpose:     wxColour class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        colour.h
 // Purpose:     wxColour class

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
+// Copyright:   (c) Stefan Csomor

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COLOUR_H_
 #define _WX_COLOUR_H_
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COLOUR_H_
 #define _WX_COLOUR_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "colour.h"
 #endif
 
 #pragma interface "colour.h"
 #endif
 


@@ -25,14 +25,18 @@ class WXDLLEXPORT wxColour: public wxObject
 public:
   // ctors
     // default
 public:
   // ctors
     // default

-  wxColour();
+  wxColour() { Init(); }

     // from RGB
     // from RGB

-  wxColour( unsigned char red, unsigned char green, unsigned char blue );
-  wxColour( unsigned long colRGB ) { Set(colRGB); }
-  
+  wxColour( unsigned char red, unsigned char green, unsigned char blue )
+      { Set(red, green, blue); }
+  wxColour( unsigned long colRGB )
+      { Set(colRGB); }
+

     // implicit conversion from the colour name
     // implicit conversion from the colour name

-  wxColour( const wxString &colourName ) { InitFromName(colourName); }
-  wxColour( const char *colourName ) { InitFromName(colourName); }
+  wxColour( const wxString &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 );


@@ -56,11 +60,6 @@ public:
   // accessors
   bool Ok() const {return m_isInit; }
 
   // 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
-

   unsigned char Red() const { return m_red; }
   unsigned char Green() const { return m_green; }
   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; }


@@ -68,15 +67,21 @@ public:
   // comparison
   bool operator == (const wxColour& colour) const
   {
   // comparison
   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); }
+
+  const WXCOLORREF& GetPixel() const { return m_pixel; };
+
+    void InitFromName(const wxString& col);

 
 

-  void InitFromName(const wxString& col);
+protected :

 
 

-  const WXCOLORREF GetPixel() const { return m_pixel; };
+    // Helper function
+    void Init();

 
 private:
   bool          m_isInit;
 
 private:
   bool          m_isInit;


@@ -86,7 +91,7 @@ private:
 
 public:
   WXCOLORREF m_pixel ;
 
 public:
   WXCOLORREF m_pixel ;

-  void Set( WXCOLORREF color ) { m_pixel = color ; m_red = m_pixel.red>>8 ;m_blue = m_pixel.blue>>8 ;m_green = m_pixel.green>>8 ;}
+  void Set( const WXCOLORREF* color ) ;

 
 private:
   DECLARE_DYNAMIC_CLASS(wxColour)
 
 private:
   DECLARE_DYNAMIC_CLASS(wxColour)