Fix wxPropertyGrid::GetPropertyRect when the last item is collapsed.

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

diff --git a/include/wx/gtk/colour.h b/include/wx/gtk/colour.h
index dc12c815ff35f16ffb6d7cc8e4a8e84a0e5ed4b6..d48d707cbe414b32a5d1b59fe3b204ace6a2c257 100644 (file)
--- a/include/wx/gtk/colour.h
+++ b/include/wx/gtk/colour.h
@@ -1,77 +1,59 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

+#ifndef _WX_GTK_COLOUR_H_
+#define _WX_GTK_COLOUR_H_

 
 

-#ifndef __GTKCOLOURH__
-#define __GTKCOLOURH__
-
-#ifdef __GNUG__
-#pragma interface
+#ifdef __WXGTK3__
+typedef struct _GdkRGBA GdkRGBA;

 #endif
 
 #endif
 

-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/string.h"
-#include "wx/gdiobj.h"
-#include "wx/palette.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxDC;
-class wxPaintDC;
-class wxBitmap;
-class wxWindow;
-
-class wxColour;
-

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

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

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxColour)
+public:
+    // constructors
+    // ------------
+    DEFINE_STD_WXCOLOUR_CONSTRUCTORS
+    wxColour(const GdkColor& gdkColor);
+#ifdef __WXGTK3__
+    wxColour(const GdkRGBA& gdkRGBA);
+#endif
+
+    virtual ~wxColour();

 
 

-  public:
+    bool operator==(const wxColour& col) const;
+    bool operator!=(const wxColour& col) const { return !(*this == col); }

 
 

-    wxColour(void);
-    wxColour( char red, char green, char blue );
-    wxColour( const wxString &colourName );
-    wxColour( const wxColour& col );
-    wxColour( const wxColour* col );
-    ~wxColour(void);
-    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 );
-    unsigned char Red(void) const;
-    unsigned char Green(void) const;
-    unsigned char Blue(void) const;
-    bool Ok(void) const;
+    unsigned char Red() const;
+    unsigned char Green() const;
+    unsigned char Blue() const;
+    unsigned char Alpha() const;

 
 

-  private:
-  public:
-  
-    friend wxDC;
-    friend wxPaintDC;
-    friend wxBitmap;
-    friend wxWindow;
-        
+    // Implementation part
+#ifdef __WXGTK3__
+    operator const GdkRGBA*() const;
+#else

     void CalcPixel( GdkColormap *cmap );
     void CalcPixel( GdkColormap *cmap );

-    int GetPixel(void);
-    GdkColor *GetColor(void);
-    
-    // no data :-)
+    int GetPixel() const;
+#endif
+    const GdkColor *GetColor() const;
+
+protected:
+    virtual void
+    InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
+
+    virtual bool FromString(const wxString& str);
+
+    DECLARE_DYNAMIC_CLASS(wxColour)

 };
 };

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