rename Inside(x,y) parameters to avoid gcc warnings about parameters shadowing member...

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

diff --git a/include/wx/mgl/pen.h b/include/wx/mgl/pen.h
index 3b69b3d054405d2e35f3d6ae3dd1839e6eb4f383..a18d97efb2a3f075b6a34465439e60f69a3be22f 100644 (file)
--- a/include/wx/mgl/pen.h
+++ b/include/wx/mgl/pen.h
@@ -7,14 +7,9 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
 #ifndef __WX_PEN_H__
 #define __WX_PEN_H__
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "pen.h"
-#endif
-
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"
@@ -38,21 +33,19 @@ public:
     wxPen() {}
     wxPen(const wxColour &colour, int width = 1, int style = wxSOLID);
     wxPen(const wxBitmap& stipple, int width);
-    wxPen(const wxPen& pen);
-    ~wxPen() {}
-    wxPen& operator = (const wxPen& pen);
+    virtual ~wxPen() {}
     bool operator == (const wxPen& pen) const;
     bool operator != (const wxPen& pen) const;
 
     void SetColour(const wxColour &colour);
-    void SetColour(int red, int green, int blue);
+    void SetColour(unsigned char red, unsigned char green, unsigned char blue);
     void SetCap(int capStyle);
     void SetJoin(int joinStyle);
     void SetStyle(int style);
     void SetWidth(int width);
     void SetDashes(int number_of_dashes, const wxDash *dash);
     void SetStipple(const wxBitmap& stipple);
-    
+
     wxColour &GetColour() const;
     int GetCap() const;
     int GetJoin() const;
@@ -62,8 +55,9 @@ public:
     int GetDashCount() const;
     wxDash* GetDash() const;
     wxBitmap *GetStipple() const;
-    
-    bool Ok() const;
+
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const;
 
     // implementation:
     void* GetPixPattern() const;
@@ -73,7 +67,7 @@ protected:
     virtual wxObjectRefData *CreateRefData() const;
     virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
 
-private:    
+private:
     DECLARE_DYNAMIC_CLASS(wxPen)
 };