wxCoordRound() -> wxRound()

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

diff --git a/include/wx/motif/colour.h b/include/wx/motif/colour.h
index 9d89cccac4e746cb7048c4ff45265f51d5db93cd..3f628a90d69a011e5f3d1a53cfc7f53c58ec3411 100644 (file)
--- a/include/wx/motif/colour.h
+++ b/include/wx/motif/colour.h
@@ -36,13 +36,14 @@ public:
 
 
     // accessors
-    bool Ok() const {return m_isInit; }
+    bool Ok() const { return IsOk(); }
+    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; }
 
-    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); }
 
@@ -56,7 +57,7 @@ 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.
 
-    int AllocColour(WXDisplay* display, bool realloc = false);
+    WXPixel AllocColour(WXDisplay* display, bool realloc = false);
 
 protected:
     // Helper function
@@ -72,7 +73,7 @@ private:
     unsigned char m_green;
 
 public:
-    int           m_pixel;
+    WXPixel       m_pixel;
 };
 
 #endif