compile fixes.

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

diff --git a/include/wx/qt/colour.h b/include/wx/qt/colour.h
index f37554e841a0093de2165568255d8ffc1bdb798a..e8fca8e3b413d11cf03faae06f87a69619641953 100644 (file)
--- a/include/wx/qt/colour.h
+++ b/include/wx/qt/colour.h
@@ -1,75 +1,68 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        colour.h
 /////////////////////////////////////////////////////////////////////////////
 // Name:        colour.h

-// Purpose:
-// Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Purpose:     wxColour class
+// Author:      AUTHOR
+// Modified by:
+// Created:     ??/??/98
+// RCS-ID:      $Id$
+// Copyright:   (c) AUTHOR

 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-
-#ifndef __GTKCOLOURH__
-#define __GTKCOLOURH__
+#ifndef _WX_COLOUR_H_
+#define _WX_COLOUR_H_

 
 #ifdef __GNUG__
 
 #ifdef __GNUG__

-#pragma interface
+#pragma interface "colour.h"

 #endif
 
 #endif
 

-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/string.h"
-#include "wx/gdiobj.h"
-#include "wx/palette.h"
+// Colour
+class WXDLLEXPORT wxColour: public wxObject
+{
+  DECLARE_DYNAMIC_CLASS(wxColour)
+public:
+  wxColour();
+  wxColour(unsigned char r, unsigned char g, unsigned char b);
+  wxColour(unsigned long colRGB) { Set(colRGB); }
+  wxColour(const wxColour& col);
+  wxColour(const wxString& col);
+  ~wxColour() ;
+  wxColour& operator =(const wxColour& src) ;
+  wxColour& operator =(const wxString& src) ;
+  inline int Ok() const { return (m_isInit) ; }

 
 

-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
+  void Set(unsigned char r, unsigned char g, unsigned char b);
+  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)); 
+  }

 
 

-class wxDC;
-class wxPaintDC;
-class wxBitmap;
-class wxWindow;
+  inline unsigned char Red() const { return m_red; }
+  inline unsigned char Green() const { return m_green; }
+  inline unsigned char Blue() const { return m_blue; }

 
 

-class wxColour;
+  inline bool operator == (const wxColour& colour) { return (m_red == colour.m_red && m_green == colour.m_green && m_blue == colour.m_blue); }

 
 

-//-----------------------------------------------------------------------------
-// wxColour
-//-----------------------------------------------------------------------------
+  inline bool operator != (const wxColour& colour) { return (!(m_red == colour.m_red && m_green == colour.m_green && m_blue == colour.m_blue)); }

 
 

-class wxColour: public wxGDIObject
-{
-  DECLARE_DYNAMIC_CLASS(wxColour)
+  WXCOLORREF GetPixel() const { return m_pixel; };

 
 

-  public:
+ private:
+  bool                         m_isInit;
+  unsigned char m_red;
+  unsigned char m_blue;
+  unsigned char m_green;
+ public:
+/* TODO: implementation
+  WXCOLORREF m_pixel ;
+*/
+};

 
 

-    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;
+#define wxColor wxColour

 
 

-  private:
-  public:
-  
-    friend wxDC;
-    friend wxPaintDC;
-    friend wxBitmap;
-    friend wxWindow;
-        
-    int GetPixel(void);
-    
-    // no data :-)
-};
-  
-#endif // __GTKCOLOURH__
+#endif
+       // _WX_COLOUR_H_