Removed windows.h and friend function.

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

diff --git a/include/wx/motif/colour.h b/include/wx/motif/colour.h
index 28cd53508019241dfa9f9a7b53569183ca4a84d8..9ce941f2a8833f3ea8fa027fa5bede32da775465 100644 (file)
--- a/include/wx/motif/colour.h
+++ b/include/wx/motif/colour.h
@@ -52,19 +52,27 @@ public:
 
   inline bool operator != (const wxColour& colour) { return (!(m_red == colour.m_red && m_green == colour.m_green && m_blue == colour.m_blue)); }
 
-/* TODO
-  WXCOLORREF GetPixel() const { return m_pixel; };
-*/
+  inline int GetPixel() const { return m_pixel; };
+  inline void SetPixel(int pixel) { m_pixel = pixel; m_isInit = TRUE; };
+
+  // Allocate a colour, or nearest colour, using the given display.
+  // If realloc is TRUE, ignore the existing pixel, otherwise just return
+  // the existing one.
+  // Returns the allocated pixel.
+
+  // TODO: can this handle mono displays? If not, we should have an extra
+  // flag to specify whether this should be black or white by default.
+
+  int AllocColour(WXDisplay* display, bool realloc = FALSE);
 
  private:
-  bool                         m_isInit;
+  bool          m_isInit;
   unsigned char m_red;
   unsigned char m_blue;
   unsigned char m_green;
  public:
-/* TODO: implementation
-  WXCOLORREF m_pixel ;
-*/
+  int           m_pixel;
+
 };
 
 #define wxColor wxColour