added wxSpinCtrlDouble (slightly modified patch 1835864)

[wxWidgets.git] / include / wx / mac / carbon / pen.h

diff --git a/include/wx/mac/carbon/pen.h b/include/wx/mac/carbon/pen.h
index ee28813e408101c4286a81722a1f7b0ffe81dd58..9c3c3655471ee8e290405b42d850f8aa7441bbb6 100644 (file)
--- a/include/wx/mac/carbon/pen.h
+++ b/include/wx/mac/carbon/pen.h
@@ -17,11 +17,15 @@
 #include "wx/bitmap.h"
 
 // Pen
-class WXDLLEXPORT wxPen : public wxGDIObject
+class WXDLLEXPORT wxPen : public wxPenBase
 {
 public:
     wxPen();
-    wxPen(const wxColour& col, int width = 1, int style = wxSOLID);
+    wxPen(const wxColour& col, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID);
+#if WXWIN_COMPATIBILITY_2_8
+    wxDEPRECATED( wxPen(const wxColour& col, int width, wxBrushStyle style) );
+#endif
+
     wxPen(const wxBitmap& stipple, int width);
     virtual ~wxPen();
 
@@ -33,17 +37,17 @@ public:
     void SetColour(unsigned char r, unsigned char g, unsigned char b) ;
 
     void SetWidth(int width)  ;
-    void SetStyle(int style)  ;
+    void SetStyle(wxPenStyle style)  ;
     void SetStipple(const wxBitmap& stipple)  ;
     void SetDashes(int nb_dashes, const wxDash *dash)  ;
-    void SetJoin(int join)  ;
-    void SetCap(int cap)  ;
+    void SetJoin(wxPenJoin join)  ;
+    void SetCap(wxPenCap cap)  ;
 
     wxColour& GetColour() const ;
     int GetWidth() const;
-    int GetStyle() const;
-    int GetJoin() const;
-    int GetCap() const;
+    wxPenStyle GetStyle() const;
+    wxPenJoin GetJoin() const;
+    wxPenCap GetCap() const;
     int GetDashes(wxDash **ptr) const;
 
     wxBitmap *GetStipple() const ;