wxBusyInfo interface moved to generic to make space for possible native implementatio...

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

diff --git a/include/wx/os2/colour.h b/include/wx/os2/colour.h
index 31864682cd67003762ace375fcf024c48433cc02..5717abd0af13e083af87648e3ec1a173c5c1bbc4 100644 (file)
--- a/include/wx/os2/colour.h
+++ b/include/wx/os2/colour.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        colour.h
+// Name:        wx/os2/colour.h

 // Purpose:     wxColour class
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxColour class
 // Author:      David Webster
 // Modified by:


@@ -18,56 +18,36 @@
 class WXDLLEXPORT wxColour: public wxObject
 {
 public:
 class WXDLLEXPORT wxColour: public wxObject
 {
 public:

-    //
-    // Ctors
-    //
+    // constructors
+    // ------------

 
 

-    //
-    // Default
-    //
+    // default

     wxColour();
 
     wxColour();
 

-    //
-    // from RGB
-    //
-    wxColour( unsigned char cRed
-             ,unsigned char cGreen
-             ,unsigned char cBlue
-            );
+    // from separate RGB
+    wxColour( unsigned char cRed, unsigned char cGreen, unsigned char cBlue );

 
 

+    // from packed RGB

     wxColour( unsigned long colRGB ) { Set(colRGB); }
 
     wxColour( unsigned long colRGB ) { Set(colRGB); }
 

-    //

     // Implicit conversion from the colour name
     // Implicit conversion from the colour name

-    //

     wxColour(const wxString& rColourName) { InitFromName(rColourName); }
     wxColour(const wxChar *zColourName) { InitFromName(zColourName); }
 
     wxColour(const wxString& rColourName) { InitFromName(rColourName); }
     wxColour(const wxChar *zColourName) { InitFromName(zColourName); }
 

-    //

     // Copy ctors and assignment operators
     // Copy ctors and assignment operators

-    //

     wxColour(const wxColour& rCol);
     wxColour(const wxColour* pCol);
     wxColour&operator = (const wxColour& rCol);
 
     wxColour(const wxColour& rCol);
     wxColour(const wxColour* pCol);
     wxColour&operator = (const wxColour& rCol);
 

-    //

     // Dtor
     // Dtor

-    //

     ~wxColour();
 
     ~wxColour();
 

-    //

     // Set functions
     // Set functions

-    //
-    void Set( unsigned char cRed
-             ,unsigned char cGreen
-             ,unsigned char cBlue
-            );
-    void Set(unsigned long lColRGB)
+    void Set( unsigned char cRed, unsigned char cGreen, unsigned char cBlue);
+    void Set( unsigned long lColRGB)

     {
     {

-        //

         // 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
         // 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)lColRGB
             ,(unsigned char)(lColRGB >> 8)
             ,(unsigned char)(lColRGB >> 16)
         Set( (unsigned char)lColRGB
             ,(unsigned char)(lColRGB >> 8)
             ,(unsigned char)(lColRGB >> 16)


@@ -78,21 +58,17 @@ public:
         InitFromName(rsColour);
     }
 
         InitFromName(rsColour);
     }
 

-    //

     // Accessors
     // Accessors

-    //

     bool Ok(void) const {return m_bIsInit; }
 
     unsigned char Red(void) const { return m_cRed; }
     unsigned char Green(void) const { return m_cGreen; }
     unsigned char Blue(void) const { return m_cBlue; }
 
     bool Ok(void) const {return m_bIsInit; }
 
     unsigned char Red(void) const { return m_cRed; }
     unsigned char Green(void) const { return m_cGreen; }
     unsigned char Blue(void) const { return m_cBlue; }
 

-    //

     // Comparison
     // Comparison

-    //

     bool operator == (const wxColour& rColour) const
     {
     bool operator == (const wxColour& rColour) const
     {

-        return (m_isInit == rColour.m_isInit
+        return (m_bIsInit == rColour.m_bIsInit

                 && m_cRed   == rColour.m_cRed
                 && m_cGreen == rColour.m_cGreen
                 && m_cBlue  == rColour.m_cBlue
                 && m_cRed   == rColour.m_cRed
                 && m_cGreen == rColour.m_cGreen
                 && m_cBlue  == rColour.m_cBlue


@@ -118,7 +94,7 @@ private:
 public:
     WXCOLORREF                      m_vPixel ;
 private:
 public:
     WXCOLORREF                      m_vPixel ;
 private:

-  DECLARE_DYNAMIC_CLASS(wxColour)
+    DECLARE_DYNAMIC_CLASS(wxColour)

 }; // end of class wxColour
 
 #endif
 }; // end of class wxColour
 
 #endif