missing commit

[wxWidgets.git] / src / x11 / pen.cpp

diff --git a/src/x11/pen.cpp b/src/x11/pen.cpp
index f6dccc9a9ea68cb614d0729e64a473db4330b48d..c17740e4d9166fd746b1d16e1a1c17617b59290b 100644 (file)
--- a/src/x11/pen.cpp
+++ b/src/x11/pen.cpp
@@ -12,25 +12,28 @@
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/utils.h"

 #include "wx/pen.h"
 #include "wx/pen.h"

-#include "wx/colour.h"
-#include "wx/bitmap.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+    #include "wx/bitmap.h"
+    #include "wx/colour.h"
+#endif

 
 //-----------------------------------------------------------------------------
 // wxPen
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxPen
 //-----------------------------------------------------------------------------
 

-class wxPenRefData: public wxObjectRefData
+class wxPenRefData : public wxGDIRefData

 {
 public:
     wxPenRefData()
     {
         m_width = 1;
 {
 public:
     wxPenRefData()
     {
         m_width = 1;

-        m_style = wxSOLID;
+        m_style = wxPENSTYLE_SOLID;

         m_joinStyle = wxJOIN_ROUND;
         m_capStyle = wxCAP_ROUND;
         m_joinStyle = wxJOIN_ROUND;
         m_capStyle = wxCAP_ROUND;

-        m_dash = (wxX11Dash*) NULL;
+        m_dash = NULL;

         m_countDashes = 0;
     }
 
         m_countDashes = 0;
     }
 


@@ -60,9 +63,9 @@ public:
     }
 
     int        m_width;
     }
 
     int        m_width;

-    int        m_style;
-    int        m_joinStyle;
-    int        m_capStyle;
+    wxPenStyle m_style;
+    wxPenJoin  m_joinStyle;
+    wxPenCap   m_capStyle;

     wxColour   m_colour;
     int        m_countDashes;
     wxBitmap   m_stipple;
     wxColour   m_colour;
     int        m_countDashes;
     wxBitmap   m_stipple;


@@ -75,7 +78,7 @@ public:
 
 IMPLEMENT_DYNAMIC_CLASS(wxPen,wxGDIObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxPen,wxGDIObject)
 

-wxPen::wxPen( const wxColour &colour, int width, int style )
+wxPen::wxPen( const wxColour &colour, int width, wxPenStyle style )

 {
     m_refData = new wxPenRefData();
     M_PENDATA->m_width = width;
 {
     m_refData = new wxPenRefData();
     M_PENDATA->m_width = width;


@@ -83,17 +86,27 @@ wxPen::wxPen( const wxColour &colour, int width, int style )
     M_PENDATA->m_colour = colour;
 }
 
     M_PENDATA->m_colour = colour;
 }
 

+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+wxPen::wxPen(const wxColour& colour, int width, int style)
+{
+    m_refData = new wxPenRefData();
+    M_PENDATA->m_width = width;
+    M_PENDATA->m_style = (wxPenStyle)style;
+    M_PENDATA->m_colour = colour;
+}
+#endif
+

 wxPen::~wxPen()
 {
     // m_refData unrefed in ~wxObject
 }
 
 wxPen::~wxPen()
 {
     // m_refData unrefed in ~wxObject
 }
 

-wxObjectRefData *wxPen::CreateRefData() const
+wxGDIRefData *wxPen::CreateGDIRefData() const

 {
     return new wxPenRefData;
 }
 
 {
     return new wxPenRefData;
 }
 

-wxObjectRefData *wxPen::CloneRefData(const wxObjectRefData *data) const
+wxGDIRefData *wxPen::CloneGDIRefData(const wxGDIRefData *data) const

 {
     return new wxPenRefData(*(wxPenRefData *)data);
 }
 {
     return new wxPenRefData(*(wxPenRefData *)data);
 }


@@ -129,28 +142,28 @@ void wxPen::SetColour( unsigned char red, unsigned char green, unsigned char blu
     M_PENDATA->m_colour.Set( red, green, blue );
 }
 
     M_PENDATA->m_colour.Set( red, green, blue );
 }
 

-void wxPen::SetCap( int capStyle )
+void wxPen::SetCap( wxPenCap capStyle )

 {
     AllocExclusive();
 
     M_PENDATA->m_capStyle = capStyle;
 }
 
 {
     AllocExclusive();
 
     M_PENDATA->m_capStyle = capStyle;
 }
 

-void wxPen::SetJoin( int joinStyle )
+void wxPen::SetJoin( wxPenJoin joinStyle )

 {
     AllocExclusive();
 
     M_PENDATA->m_joinStyle = joinStyle;
 }
 
 {
     AllocExclusive();
 
     M_PENDATA->m_joinStyle = joinStyle;
 }
 

-void wxPen::SetStipple( wxBitmap *stipple )
+void wxPen::SetStipple( const wxBitmap& stipple )

 {
     AllocExclusive();
 
 {
     AllocExclusive();
 

-    M_PENDATA->m_stipple = *stipple;;
+    M_PENDATA->m_stipple = stipple;

 }
 
 }
 

-void wxPen::SetStyle( int style )
+void wxPen::SetStyle( wxPenStyle style )

 {
     AllocExclusive();
 
 {
     AllocExclusive();
 


@@ -166,8 +179,10 @@ void wxPen::SetWidth( int width )
 
 int wxPen::GetDashes( wxDash **ptr ) const
 {
 
 int wxPen::GetDashes( wxDash **ptr ) const
 {

-     *ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*) NULL);
-     return (M_PENDATA ? M_PENDATA->m_countDashes : 0);
+    wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") );
+
+    *ptr = (wxDash*)M_PENDATA->m_dash;
+    return M_PENDATA->m_countDashes;

 }
 
 int wxPen::GetDashCount() const
 }
 
 int wxPen::GetDashCount() const


@@ -180,44 +195,44 @@ wxDash* wxPen::GetDash() const
     return (wxDash*)M_PENDATA->m_dash;
 }
 
     return (wxDash*)M_PENDATA->m_dash;
 }
 

-int wxPen::GetCap() const
+wxPenCap wxPen::GetCap() const

 {
 {

-    wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
+    wxCHECK_MSG( IsOk(), wxCAP_INVALID, wxT("invalid pen") );

 
     return M_PENDATA->m_capStyle;
 }
 
 
     return M_PENDATA->m_capStyle;
 }
 

-int wxPen::GetJoin() const
+wxPenJoin wxPen::GetJoin() const

 {
 {

-    wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
+    wxCHECK_MSG( IsOk(), wxJOIN_INVALID, wxT("invalid pen") );

 
     return M_PENDATA->m_joinStyle;
 }
 
 
     return M_PENDATA->m_joinStyle;
 }
 

-int wxPen::GetStyle() const
+wxPenStyle wxPen::GetStyle() const

 {
 {

-    wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
+    wxCHECK_MSG( IsOk(), wxPENSTYLE_INVALID, wxT("invalid pen") );

 
     return M_PENDATA->m_style;
 }
 
 int wxPen::GetWidth() const
 {
 
     return M_PENDATA->m_style;
 }
 
 int wxPen::GetWidth() const
 {

-    wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
+    wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") );

 
     return M_PENDATA->m_width;
 }
 
 
     return M_PENDATA->m_width;
 }
 

-wxColour &wxPen::GetColour() const
+wxColour wxPen::GetColour() const

 {
 {

-    wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid pen") );
+    wxCHECK_MSG( IsOk(), wxNullColour, wxT("invalid pen") );

 
     return M_PENDATA->m_colour;
 }
 
 wxBitmap *wxPen::GetStipple() const
 {
 
     return M_PENDATA->m_colour;
 }
 
 wxBitmap *wxPen::GetStipple() const
 {

-    wxCHECK_MSG( Ok(), &wxNullBitmap, wxT("invalid pen") );
+    wxCHECK_MSG( IsOk(), &wxNullBitmap, wxT("invalid pen") );

 
     return &M_PENDATA->m_stipple;
 }
 
     return &M_PENDATA->m_stipple;
 }