TWIN32 compatibility added; wxMotif uses wxGTK's wxPostScriptDC;

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

diff --git a/include/wx/gtk1/colour.h b/include/wx/gtk1/colour.h
index 77e4155350d8447ca57fdb60cf651ce90c8a8833..ff686d2e0670032693d904ccb96b2ad4a49979f8 100644 (file)
--- a/include/wx/gtk1/colour.h
+++ b/include/wx/gtk1/colour.h
@@ -2,9 +2,9 @@
 // Name:        colour.h
 // Purpose:
 // Author:      Robert Roebling
 // Name:        colour.h
 // Purpose:
 // Author:      Robert Roebling

-// Id:          $id$
+// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

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


@@ -43,14 +43,13 @@ public:
     // default
   wxColour();
     // from RGB
     // default
   wxColour();
     // from RGB

-  wxColour( char red, char green, char blue );
+  wxColour( unsigned char red, unsigned char green, unsigned char blue );

     // implicit conversion from the colour name
   wxColour( const wxString &colourName ) { InitFromName(colourName); }
   wxColour( const char *colourName ) { InitFromName(colourName); }
 
     // copy ctors and assignment operators
   wxColour( const wxColour& col );
     // implicit conversion from the colour name
   wxColour( const wxString &colourName ) { InitFromName(colourName); }
   wxColour( const char *colourName ) { InitFromName(colourName); }
 
     // copy ctors and assignment operators
   wxColour( const wxColour& col );

-  wxColour( const wxColour* col );

   wxColour& operator = ( const wxColour& col );
 
     // dtor
   wxColour& operator = ( const wxColour& col );
 
     // dtor


@@ -59,7 +58,7 @@ public:
   // comparison
   bool operator == ( const wxColour& col );
   bool operator != ( const wxColour& col );
   // comparison
   bool operator == ( const wxColour& col );
   bool operator != ( const wxColour& col );

-  
+

   // accessors
   void Set( unsigned char red, unsigned char green, unsigned char blue );
   unsigned char Red() const;
   // accessors
   void Set( unsigned char red, unsigned char green, unsigned char blue );
   unsigned char Red() const;