Fix broken and missing DataView interface items for Phoenix

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

diff --git a/src/gtk/pen.cpp b/src/gtk/pen.cpp
index e1c2744d2a08d4450526f0d6335c6230f48b7cd5..4081bf6dfce861962fe133aee7458b11200d4853 100644 (file)
--- a/src/gtk/pen.cpp
+++ b/src/gtk/pen.cpp
@@ -31,7 +31,7 @@ public:
         m_style = wxPENSTYLE_SOLID;
         m_joinStyle = wxJOIN_ROUND;
         m_capStyle = wxCAP_ROUND;
         m_style = wxPENSTYLE_SOLID;
         m_joinStyle = wxJOIN_ROUND;
         m_capStyle = wxCAP_ROUND;

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

         m_countDashes = 0;
     }
 
         m_countDashes = 0;
     }
 


@@ -96,13 +96,15 @@ wxPen::wxPen( const wxColour &colour, int width, wxPenStyle style )
     M_PENDATA->m_colour = colour;
 }
 
     M_PENDATA->m_colour = colour;
 }
 

-wxPen::wxPen(const wxColour& colour, int width, wxBrushStyle style)
+#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;
 }
 {
     m_refData = new wxPenRefData();
     M_PENDATA->m_width = width;
     M_PENDATA->m_style = (wxPenStyle)style;
     M_PENDATA->m_colour = colour;
 }

+#endif

 
 wxPen::~wxPen()
 {
 
 wxPen::~wxPen()
 {


@@ -180,51 +182,69 @@ 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
 {

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

     return (M_PENDATA->m_countDashes);
 }
 
 wxDash* wxPen::GetDash() const
 {
     return (M_PENDATA->m_countDashes);
 }
 
 wxDash* wxPen::GetDash() const
 {

+    wxCHECK_MSG( IsOk(), NULL, wxT("invalid pen") );
+

     return (wxDash*)M_PENDATA->m_dash;
 }
 
 wxPenCap wxPen::GetCap() const
 {
     return (wxDash*)M_PENDATA->m_dash;
 }
 
 wxPenCap wxPen::GetCap() const
 {

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

 
     return M_PENDATA->m_capStyle;
 }
 
 wxPenJoin wxPen::GetJoin() const
 {
 
     return M_PENDATA->m_capStyle;
 }
 
 wxPenJoin wxPen::GetJoin() const
 {

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

 
     return M_PENDATA->m_joinStyle;
 }
 
 wxPenStyle wxPen::GetStyle() const
 {
 
     return M_PENDATA->m_joinStyle;
 }
 
 wxPenStyle wxPen::GetStyle() const
 {

-    wxCHECK_MSG( Ok(), wxPENSTYLE_MAX, 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;
 }
 
     return M_PENDATA->m_colour;
 }

+
+// stippled pens are not supported by wxGTK
+void wxPen::SetStipple(const wxBitmap& WXUNUSED(stipple))
+{
+    wxFAIL_MSG( "stippled pens not supported" );
+}
+
+wxBitmap *wxPen::GetStipple() const
+{
+    return NULL;
+}
+