Reapply wxWeakRef patch again

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

diff --git a/include/wx/gtk/colour.h b/include/wx/gtk/colour.h
index e168cb381045d1f929b3eb1fbdb0f8d3bc1d6b8a..410705fe656b79f0861fbfa60e0bad7cdbf19faf 100644 (file)
--- a/include/wx/gtk/colour.h
+++ b/include/wx/gtk/colour.h
@@ -7,98 +7,44 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __GTKCOLOURH__
-#define __GTKCOLOURH__
-
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/string.h"
-#include "wx/gdiobj.h"
-#include "wx/palette.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxDC;
-class WXDLLIMPEXP_CORE wxPaintDC;
-class WXDLLIMPEXP_CORE wxBitmap;
-class WXDLLIMPEXP_CORE wxWindow;
-
-class WXDLLIMPEXP_CORE wxColour;
+#ifndef _WX_GTK_COLOUR_H_
+#define _WX_GTK_COLOUR_H_

 
 //-----------------------------------------------------------------------------
 // wxColour
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxColour
 //-----------------------------------------------------------------------------
 

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

 {
 public:
     // constructors
     // ------------
 {
 public:
     // constructors
     // ------------

+    DEFINE_STD_WXCOLOUR_CONSTRUCTORS
+    wxColour(const GdkColor& gdkColor);

 
 

-    // default
-    wxColour() { }
-
-    // from separate RGB
-    wxColour( unsigned char red, unsigned char green, unsigned char blue );
-
-    // from packed RGB
-    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
+    virtual ~wxColour();

 
 

-
-    wxColour( const wxColour& col )
-        : wxGDIObject()
-        { Ref(col); }
-    wxColour& operator = ( const wxColour& col ) { Ref(col); return *this; }
-
-    ~wxColour();
-
-    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));
-    }
+    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;

-
-
-    // Get colour from name or wxNullColour
-    static wxColour CreateByName(const wxString& name);
+    unsigned char Alpha() const;

 
     // Implementation part
     void CalcPixel( GdkColormap *cmap );
     int GetPixel() const;
 
     // Implementation part
     void CalcPixel( GdkColormap *cmap );
     int GetPixel() const;

-    GdkColor *GetColor() const;
-
-    void InitFromName(const wxString& colourName);
+    const GdkColor *GetColor() const;

 
 protected:
 
 protected:

-    // ref counting code
-    virtual wxObjectRefData *CreateRefData() const;
-    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
+    virtual void
+    InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a);

 
 

+    virtual bool FromString(const wxString& str);

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

-#endif // __GTKCOLOURH__
+#endif // _WX_GTK_COLOUR_H_