use native toolbar, font dialog and CG by default

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

diff --git a/include/wx/mgl/pen.h b/include/wx/mgl/pen.h
index d3c44594554e150115f93091b63d6485c7b02b41..a18d97efb2a3f075b6a34465439e60f69a3be22f 100644 (file)
--- a/include/wx/mgl/pen.h
+++ b/include/wx/mgl/pen.h
@@ -1,20 +1,15 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$

-// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
+// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifndef __WX_PEN_H__
 #define __WX_PEN_H__
 
 #ifndef __WX_PEN_H__
 #define __WX_PEN_H__
 

-#ifdef __GNUG__
-#pragma interface "pen.h"
-#endif
-

 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"


@@ -36,23 +31,21 @@ class WXDLLEXPORT wxPen: public wxGDIObject
 {
 public:
     wxPen() {}
 {
 public:
     wxPen() {}

-    wxPen(const wxColour &colour, int width, int style);
+    wxPen(const wxColour &colour, int width = 1, int style = wxSOLID);

     wxPen(const wxBitmap& stipple, int width);
     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);
     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);
     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;
     wxColour &GetColour() const;
     int GetCap() const;
     int GetJoin() const;


@@ -62,8 +55,9 @@ public:
     int GetDashCount() const;
     wxDash* GetDash() const;
     wxBitmap *GetStipple() const;
     int GetDashCount() const;
     wxDash* GetDash() const;
     wxBitmap *GetStipple() const;

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

 
     // implementation:
     void* GetPixPattern() const;
 
     // implementation:
     void* GetPixPattern() const;


@@ -73,7 +67,7 @@ protected:
     virtual wxObjectRefData *CreateRefData() const;
     virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
 
     virtual wxObjectRefData *CreateRefData() const;
     virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
 

-private:    
+private:

     DECLARE_DYNAMIC_CLASS(wxPen)
 };
 
     DECLARE_DYNAMIC_CLASS(wxPen)
 };