Minor corrections to make dist after reports

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

diff --git a/include/wx/motif/colour.h b/include/wx/motif/colour.h
index 7f289660bf8c7480187700866a24734231321dab..01a825a2c6031b49e9e2bd15fb026545d13a3351 100644 (file)
--- a/include/wx/motif/colour.h
+++ b/include/wx/motif/colour.h
@@ -16,15 +16,12 @@
 #include "wx/string.h"
 
 // Colour
 #include "wx/string.h"
 
 // Colour

-class WXDLLEXPORT wxColour : public wxColourBase
+class WXDLLIMPEXP_CORE wxColour : public wxColourBase

 {
     DECLARE_DYNAMIC_CLASS(wxColour)
 public:
     // constructors
     // ------------
 {
     DECLARE_DYNAMIC_CLASS(wxColour)
 public:
     // constructors
     // ------------

-
-    // default
-    wxColour() { Init(); }

     DEFINE_STD_WXCOLOUR_CONSTRUCTORS
 
     // copy ctors and assignment operators
     DEFINE_STD_WXCOLOUR_CONSTRUCTORS
 
     // copy ctors and assignment operators


@@ -32,17 +29,17 @@ public:
     wxColour& operator = ( const wxColour& col );
 
     // dtor
     wxColour& operator = ( const wxColour& col );
 
     // dtor

-    ~wxColour();
+    virtual ~wxColour();

 
 
     // accessors
 
 
     // accessors

-    bool Ok() const {return m_isInit; }
+    virtual bool IsOk() const {return m_isInit; }

     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; }
 

-    int GetPixel() const { return m_pixel; };
-    void SetPixel(int pixel) { m_pixel = pixel; m_isInit = true; };
+    WXPixel GetPixel() const { return m_pixel; };
+    void SetPixel(WXPixel pixel) { m_pixel = pixel; m_isInit = true; };

 
     inline bool operator == (const wxColour& colour) const { return (m_red == colour.m_red && m_green == colour.m_green && m_blue == colour.m_blue); }
 
 
     inline bool operator == (const wxColour& colour) const { return (m_red == colour.m_red && m_green == colour.m_green && m_blue == colour.m_blue); }
 


@@ -56,13 +53,14 @@ public:
     // 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.
 
     // 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);
+    WXPixel AllocColour(WXDisplay* display, bool realloc = false);

 
 protected:
     // Helper function
     void Init();
 
 
 protected:
     // Helper function
     void Init();
 

-    virtual void InitWith( unsigned char red, unsigned char green, unsigned char blue );
+    virtual void
+    InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a);

 
 private:
     bool          m_isInit;
 
 private:
     bool          m_isInit;


@@ -71,7 +69,7 @@ private:
     unsigned char m_green;
 
 public:
     unsigned char m_green;
 
 public:

-    int           m_pixel;
+    WXPixel       m_pixel;

 };
 
 #endif
 };
 
 #endif