Blind wxTinderbox fix.

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

diff --git a/include/wx/gtk/colour.h b/include/wx/gtk/colour.h
index 26f30c60c4c88e66e6fdd755ded579a6e1b5b4ae..26f002d077f14163c28b81731044c9028fc0795b 100644 (file)
--- a/include/wx/gtk/colour.h
+++ b/include/wx/gtk/colour.h
@@ -1,21 +1,15 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        colour.h
+// Name:        wx/gtk/colour.h

 // Purpose:
 // Author:      Robert Roebling
 // 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__
 
 #ifndef __GTKCOLOURH__
 #define __GTKCOLOURH__
 

-#ifdef __GNUG__
-#pragma interface
-#endif
-

 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"


@@ -26,56 +20,56 @@
 // classes
 //-----------------------------------------------------------------------------
 
 // 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
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxColour
 //-----------------------------------------------------------------------------
 

-class wxColour: public wxGDIObject
+class WXDLLIMPEXP_CORE wxColour : public wxColourBase

 {
 {

-  public:
-
-    wxColour();
-    wxColour( char red, char green, char blue );
-    wxColour( const wxString &colourName ) { InitFromName(colourName); }
-    wxColour( const char *colourName ) { InitFromName(colourName); }
-    wxColour( const wxColour& col );
-    wxColour( const wxColour* col );
+public:
+    // constructors
+    // ------------
+
+    // default
+    wxColour() {}
+    DEFINE_STD_WXCOLOUR_CONSTRUCTORS
+    wxColour(const GdkColor& gdkColor);
+

     ~wxColour();
     ~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); }
+

     unsigned char Red() const;
     unsigned char Green() const;
     unsigned char Blue() const;
     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;
     void CalcPixel( GdkColormap *cmap );
     int GetPixel() const;

+#ifdef __WXGTK24__
+    const GdkColor *GetColor() const;
+#else
+    // GDK functions from old gtk2 versions take non-const color parameters,
+    // too many uses to deal with individually

     GdkColor *GetColor() const;
     GdkColor *GetColor() const;

-    
+#endif
+

 protected:
 protected:

-    // helper functions
-    void InitFromName(const wxString& colourName);
+    virtual bool FromString(const wxChar *str);
+    virtual void InitWith( unsigned char red, unsigned char green, unsigned char blue );

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

-  
+

 #endif // __GTKCOLOURH__
 #endif // __GTKCOLOURH__