Added parent window parameter to wxHelpController constructor

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

diff --git a/include/wx/mgl/colour.h b/include/wx/mgl/colour.h
index 4050f37c2a31caf860df7df3f337fb893aaef43b..81eccf5e5fa03c03a5546aa3d46fa4390c09794a 100644 (file)
--- a/include/wx/mgl/colour.h
+++ b/include/wx/mgl/colour.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxColour class
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxColour class
 // Author:      Julian Smart
 // Modified by:


@@ -12,53 +12,51 @@
 #ifndef _WX_COLOUR_H_
 #define _WX_COLOUR_H_
 
 #ifndef _WX_COLOUR_H_
 #define _WX_COLOUR_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "colour.h"
-#endif

 #include "wx/object.h"
 
 // Colour
 class WXDLLEXPORT wxColour: public wxObject
 {
 public:
 #include "wx/object.h"
 
 // Colour
 class WXDLLEXPORT wxColour: public wxObject
 {
 public:

-    // ctors
-      // default
+    // constructors
+    // ------------
+
+    // default

     wxColour();
     wxColour();

-      // from RGB
-    wxColour(unsigned char red, unsigned char green, unsigned char blue);
+
+    // from separate RGB
+    wxColour(unsigned char red, unsigned char green, unsigned char blue)
+        { Set(red, green, blue); }
+
+    // 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 &colourName) { InitFromName(colourName); }
     wxColour(const char *colourName) { InitFromName(colourName); }
 
 
     wxColour(const wxString &colourName) { InitFromName(colourName); }
     wxColour(const char *colourName) { InitFromName(colourName); }
 
 

-      // copy ctors and assignment operators
+    // copy ctors and assignment operators

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

-      // dtor
+    // dtor

     ~wxColour();
 
     // Set() functions
     void Set(unsigned char red, unsigned char green, unsigned char blue);
     void Set(unsigned long colRGB)
     {
     ~wxColour();
 
     // Set() functions
     void Set(unsigned char red, unsigned char green, unsigned char blue);
     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));
+        // 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));

     }
 
     // accessors
     bool Ok() const { return m_isInit; }
 
     }
 
     // accessors
     bool Ok() const { return m_isInit; }
 

-    // Let's remove this inelegant function
-#if WXWIN_COMPATIBILITY
-    void Get(unsigned char *r, unsigned char *g, unsigned char *b) const;
-#endif
-

     unsigned char Red() const { return m_red; }
     unsigned char Green() const { return m_green; }
     unsigned char Blue() const { return m_blue; }
     unsigned char Red() const { return m_red; }
     unsigned char Green() const { return m_green; }
     unsigned char Blue() const { return m_blue; }


@@ -66,22 +64,26 @@ 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 &&
-              m_blue == colour.m_blue &&
-              m_isInit == colour.m_isInit);
+        return (m_red == colour.m_red &&
+                m_green == colour.m_green &&
+                m_blue == colour.m_blue &&
+                m_isInit == colour.m_isInit);

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

+    void InitFromName(const wxString& colourName);
+
+protected:
+
+    // Helper function
+    void Init();
+

 private:
     bool m_isInit;
     unsigned char m_red;
     unsigned char m_blue;
     unsigned char m_green;
 
 private:
     bool m_isInit;
     unsigned char m_red;
     unsigned char m_blue;
     unsigned char m_green;
 

-    // helper func
-    void InitFromName(const wxString& colourName);
-

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