ignore warning 4535 for VC8 too as it still seems to be harmless

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

diff --git a/include/wx/x11/colour.h b/include/wx/x11/colour.h
index 30481cba51c5c17ec4c11ee683d8c9000d1a9835..101055920a921206700644142c927e2d13a960a7 100644 (file)
--- a/include/wx/x11/colour.h
+++ b/include/wx/x11/colour.h
@@ -1,21 +1,17 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        colour.h
+// Name:        wx/x11/colour.h
 // Purpose:     wxColour class
 // Author:      Julian Smart, Robert Roebling
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart, Robert Roebling
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COLOUR_H_
 #define _WX_COLOUR_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "colour.h"
-#endif
-
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"
@@ -26,62 +22,40 @@
 // classes
 //-----------------------------------------------------------------------------
 
-class wxDC;
-class wxPaintDC;
-class wxBitmap;
-class wxWindow;
+class WXDLLIMPEXP_CORE wxDC;
+class WXDLLIMPEXP_CORE wxPaintDC;
+class WXDLLIMPEXP_CORE wxBitmap;
+class WXDLLIMPEXP_CORE wxWindow;
 
-class wxColour;
+class WXDLLIMPEXP_CORE wxColour;
 
 //-----------------------------------------------------------------------------
 // wxColour
 //-----------------------------------------------------------------------------
 
-class wxColour: public wxGDIObject
+class WXDLLEXPORT wxColour : public wxColourBase
 {
 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( wxString::FromAscii(colourName) ); }
-#if wxUSE_UNICODE
-    wxColour( const wxChar *colourName ) { InitFromName( wxString(colourName) ); }
-#endif
+    // constructors
+    // ------------
 
-    // Get colour from name or wxNullColour
-    static wxColour CreateByName(const wxString& name);
+    wxColour() {}
+    DEFINE_STD_WXCOLOUR_CONSTRUCTORS
 
-    wxColour( const wxColour& col ) { Ref(col); }
-    wxColour& operator = ( const wxColour& col ) { Ref(col); return *this; }
+    virtual ~wxColour();
 
-    ~wxColour();
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return m_refData != NULL; }
 
-    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;
 
     // Implementation part
-    
+
     void CalcPixel( WXColormap cmap );
     unsigned long GetPixel() const;
     WXColor *GetColor() const;
@@ -90,9 +64,11 @@ protected:
     // ref counting code
     virtual wxObjectRefData *CreateRefData() const;
     virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
-    
-    // Helper functions
-    void InitFromName(const wxString& colourName);
+
+    virtual void
+    InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
+
+    virtual bool FromString(const wxChar *str);
 
 private:
     DECLARE_DYNAMIC_CLASS(wxColour)
@@ -101,4 +77,3 @@ private:
 #endif
 
 // _WX_COLOUR_H_
-