Removed 16-bit conditional compilation

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

diff --git a/include/wx/gtk1/colour.h b/include/wx/gtk1/colour.h
index 43f9d528399f808cf3cd47e899866d6f0de509c1..de243d30a7df5ca2c9a27995c76314b8d3a7a2b8 100644 (file)
--- a/include/wx/gtk1/colour.h
+++ b/include/wx/gtk1/colour.h
@@ -2,17 +2,16 @@
 // Name:        colour.h
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
 #ifndef __GTKCOLOURH__
 #define __GTKCOLOURH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface
 #endif
 
@@ -39,39 +38,59 @@ class wxColour;
 
 class wxColour: public wxGDIObject
 {
-  public:
-
-    wxColour();
-    wxColour( char red, char green, char blue );
+public:
+    wxColour() { }
+  
+    // Construct 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( const wxColour& col );
-    wxColour( const wxColour* col );
+    wxColour( const char *colourName ) { InitFromName( wxString::FromAscii(colourName) ); }
+#if wxUSE_UNICODE
+    wxColour( const wxChar *colourName ) { InitFromName( wxString(colourName) ); }
+#endif
+
+
+    wxColour( const wxColour& col )
+        : wxGDIObject()
+        { Ref(col); }
+    wxColour& operator = ( const wxColour& col ) { Ref(col); return *this; }
+
     ~wxColour();
-    wxColour& operator = ( const wxColour& col );
-    wxColour& operator = ( const wxString& colourName );
-    bool operator == ( const wxColour& col );
-    bool operator != ( const wxColour& col );
-    void Set( const unsigned char red, const unsigned char green, const unsigned char blue );
+
+    bool Ok() const { return m_refData != NULL; }
+  
+    bool operator == ( const wxColour& col ) const;
+    bool operator != ( const wxColour& col ) const { return !(*this == col); }
+
+    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
+        // least significant bytes contain the R, G and B values
+        Set((unsigned char)colRGB,
+            (unsigned char)(colRGB >> 8),
+            (unsigned char)(colRGB >> 16));
+    }
+
     unsigned char Red() const;
     unsigned char Green() const;
     unsigned char Blue() const;
-    bool Ok() const;
-
-  private:
-  public:
 
-    friend wxDC;
-    friend wxPaintDC;
-    friend wxBitmap;
-    friend wxWindow;
 
+    // Implementation part
     void CalcPixel( GdkColormap *cmap );
     int GetPixel() const;
     GdkColor *GetColor() const;
 
 protected:
-    // helper functions
+    // ref counting code
+    virtual wxObjectRefData *CreateRefData() const;
+    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
+    
+    // Helper functions
     void InitFromName(const wxString& colourName);
 
 private: