fix also wxPen to use wxPenStyle,wxPenJoin,wxPenCap enums instead of plain int; remov...

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

diff --git a/include/wx/gtk1/pen.h b/include/wx/gtk1/pen.h
index ccb83697037a7b1c3338f627f0312d428fbc1bef..7e85235346c5fdc694bd34d78204e182301479f6 100644 (file)
--- a/include/wx/gtk1/pen.h
+++ b/include/wx/gtk1/pen.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        wx/gtk/pen.h
+// Name:        wx/gtk1/pen.h

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -20,9 +20,9 @@
 // classes
 //-----------------------------------------------------------------------------
 
 // classes
 //-----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxPen;
+class WXDLLIMPEXP_FWD_CORE wxPen;

 
 

-#if defined(__WXGTK127__) || defined(__WXGTK20__)
+#if defined(__WXGTK127__)

 typedef    gint8 wxGTKDash;
 #else
 typedef    gchar wxGTKDash;
 typedef    gint8 wxGTKDash;
 #else
 typedef    gchar wxGTKDash;


@@ -32,46 +32,42 @@ typedef    gchar wxGTKDash;
 // wxPen
 //-----------------------------------------------------------------------------
 
 // wxPen
 //-----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxPen: public wxGDIObject
+class WXDLLIMPEXP_CORE wxPen: public wxPenBase

 {
 public:
     wxPen() { }
 {
 public:
     wxPen() { }

-    
-    wxPen( const wxColour &colour, int width = 1, int style = wxSOLID );
-    ~wxPen();
-    
-    wxPen( const wxPen& pen )
-        : wxGDIObject()
-        { Ref(pen); }
-    wxPen& operator = ( const wxPen& pen ) { Ref(pen); return *this; }
-    
-    bool Ok() const { return m_refData != NULL; }
-    
-    bool operator == ( const wxPen& pen ) const;
-    bool operator != (const wxPen& pen) const { return !(*this == pen); }
+
+    wxPen( const wxColour &colour, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID );
+#if WXWIN_COMPATIBILITY_2_8
+    wxDEPRECATED( wxPen(const wxColour& col, int width, wxBrushStyle style) );
+#endif
+
+    virtual ~wxPen();
+
+    bool operator==(const wxPen& pen) const;
+    bool operator!=(const wxPen& pen) const { return !(*this == pen); }

 
     void SetColour( const wxColour &colour );
 
     void SetColour( const wxColour &colour );

-    void SetColour( int red, int green, int blue );
-    void SetCap( int capStyle );
-    void SetJoin( int joinStyle );
-    void SetStyle( int style );
+    void SetColour( unsigned char red, unsigned char green, unsigned char blue );
+    void SetCap( wxPenCap capStyle );
+    void SetJoin( wxPenJoin joinStyle );
+    void SetStyle( wxPenStyle style );

     void SetWidth( int width );
     void SetDashes( int number_of_dashes, const wxDash *dash );
     void SetWidth( int width );
     void SetDashes( int number_of_dashes, const wxDash *dash );

-    
+

     wxColour &GetColour() const;
     wxColour &GetColour() const;

-    int GetCap() const;
-    int GetJoin() const;
-    int GetStyle() const;
+    wxPenCap GetCap() const;
+    wxPenJoin GetJoin() const;
+    wxPenStyle GetStyle() const;

     int GetWidth() const;
     int GetDashes(wxDash **ptr) const;
     int GetDashCount() const;
     wxDash* GetDash() const;
 
     int GetWidth() const;
     int GetDashes(wxDash **ptr) const;
     int GetDashCount() const;
     wxDash* GetDash() const;
 

-private:    
-    // ref counting code
-    virtual wxObjectRefData *CreateRefData() const;
-    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
-    
+private:
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+

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