Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/gtk/pen.h b/include/wx/gtk/pen.h
index f4ccb5f9abba71bd999dfafb38750055c6690cdb..2437073efbe8e4236e4a0266dfc9c7e0da09cb56 100644 (file)
--- a/include/wx/gtk/pen.h
+++ b/include/wx/gtk/pen.h
@@ -10,21 +10,22 @@
 #ifndef _WX_GTK_PEN_H_
 #define _WX_GTK_PEN_H_
 
 #ifndef _WX_GTK_PEN_H_
 #define _WX_GTK_PEN_H_
 

-#include "wx/gdiobj.h"
-#include "wx/gdicmn.h"
-
-typedef    gint8 wxGTKDash;
+typedef signed char 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( const wxColour &colour, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID );
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+    wxDEPRECATED_FUTURE( wxPen(const wxColour& col, int width, int style) );
+#endif
+

     virtual ~wxPen();
 
     bool operator==(const wxPen& pen) const;
     virtual ~wxPen();
 
     bool operator==(const wxPen& pen) const;


@@ -32,20 +33,27 @@ public:
 
     void SetColour( const wxColour &colour );
     void SetColour( unsigned char red, unsigned char green, unsigned char blue );
 
     void SetColour( const wxColour &colour );
     void SetColour( unsigned char red, unsigned char green, unsigned char blue );

-    void SetCap( int capStyle );
-    void SetJoin( int joinStyle );
-    void SetStyle( int style );
+    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 );

+    void SetStipple(const wxBitmap& stipple);

 
 

-    wxColour &GetColour() const;
-    int GetCap() const;
-    int GetJoin() const;
-    int GetStyle() const;
+    wxColour GetColour() 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;

+    wxBitmap *GetStipple() const;
+
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+    wxDEPRECATED_FUTURE( void SetStyle(int style) )
+        { SetStyle((wxPenStyle)style); }
+#endif

 
 protected:
     virtual wxGDIRefData *CreateGDIRefData() const;
 
 protected:
     virtual wxGDIRefData *CreateGDIRefData() const;