Some Motif fixes; makefile fixes; added wxTransferStreamToFile/FileToStream for wxWin

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

diff --git a/include/wx/os2/colour.h b/include/wx/os2/colour.h
index 24028b6756baf4926821d96666acaa1ccc8a9062..dc4b7fa4556a425b8e763bcd0db0005a7b72964e 100644 (file)
--- a/include/wx/os2/colour.h
+++ b/include/wx/os2/colour.h
@@ -1,23 +1,18 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        colour.h
 // Purpose:     wxColour class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        colour.h
 // Purpose:     wxColour class

-// Author:      AUTHOR
+// Author:      David Webster

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     10/13/99

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
+// Copyright:   (c) David Webster

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COLOUR_H_
 #define _WX_COLOUR_H_
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COLOUR_H_
 #define _WX_COLOUR_H_
 

-#ifdef __GNUG__
-#pragma interface "colour.h"
-#endif
-

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

-#include "wx/string.h"

 
 // Colour
 class WXDLLEXPORT wxColour: public wxObject
 
 // Colour
 class WXDLLEXPORT wxColour: public wxObject


@@ -66,8 +61,8 @@ public:
   // comparison
   bool operator == (const wxColour& colour) const
   {
   // comparison
   bool operator == (const wxColour& colour) const
   {

-    return (m_red == colour.m_red && 
-            m_green == colour.m_green && 
+    return (m_red == colour.m_red &&
+            m_green == colour.m_green &&

             m_blue == colour.m_blue);
   }
   bool operator != (const wxColour& colour) const { return !(*this == colour); }
             m_blue == colour.m_blue);
   }
   bool operator != (const wxColour& colour) const { return !(*this == colour); }


@@ -85,10 +80,7 @@ private:
   unsigned char m_green;
 
 public:
   unsigned char m_green;
 
 public:

-  /* TODO: implementation

      WXCOLORREF m_pixel ;
      WXCOLORREF m_pixel ;

-   */
-

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