*** empty log message ***

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

diff --git a/src/gtk1/pen.cpp b/src/gtk1/pen.cpp
index 59e2c3e06d47f545bbed6df8c7fddcaa4ad46334..7f3809f5584b9db3c83fbfb001976e4ce5c090e4 100644 (file)
--- a/src/gtk1/pen.cpp
+++ b/src/gtk1/pen.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 


@@ -14,39 +14,51 @@
 
 #include "wx/pen.h"
 
 
 #include "wx/pen.h"
 

+#include <gdk/gdk.h>
+

 //-----------------------------------------------------------------------------
 // wxPen
 //-----------------------------------------------------------------------------
 
 class wxPenRefData: public wxObjectRefData
 {
 //-----------------------------------------------------------------------------
 // wxPen
 //-----------------------------------------------------------------------------
 
 class wxPenRefData: public wxObjectRefData
 {

-  public:
-  
-    wxPenRefData(void);
-    wxPenRefData(const wxPenRefData& data);
-  
-    int        m_width;
-    int        m_style;
-    int        m_joinStyle;
-    int        m_capStyle;
-    wxColour   m_colour;
+public:
+
+  wxPenRefData();
+  wxPenRefData( const wxPenRefData& data );
+
+  int        m_width;
+  int        m_style;
+  int        m_joinStyle;
+  int        m_capStyle;
+  wxColour   m_colour;
+  int        m_countDashes;
+  wxDash    *m_dash;

 };
 
 };
 

-wxPenRefData::wxPenRefData(void)
+wxPenRefData::wxPenRefData()

 {
 {

-  m_width = 1;
-  m_style = wxSOLID;
-  m_joinStyle = wxJOIN_ROUND;
-  m_capStyle = wxCAP_ROUND;
+    m_width = 1;
+    m_style = wxSOLID;
+    m_joinStyle = wxJOIN_ROUND;
+    m_capStyle = wxCAP_ROUND;
+    m_dash = (wxDash*) NULL;
+    m_countDashes = 0;

 }
 
 wxPenRefData::wxPenRefData( const wxPenRefData& data )
 {
 }
 
 wxPenRefData::wxPenRefData( const wxPenRefData& data )
 {

-  m_style = data.m_style;
-  m_width = data.m_width;
-  m_joinStyle = data.m_joinStyle;
-  m_capStyle = data.m_capStyle;
-  m_colour = data.m_colour;
+    m_style = data.m_style;
+    m_width = data.m_width;
+    m_joinStyle = data.m_joinStyle;
+    m_capStyle = data.m_capStyle;
+    m_colour = data.m_colour;
+    m_countDashes = data.m_countDashes;
+/*
+    if (data.m_dash)  TODO
+      m_dash = new 
+*/
+    m_dash = data.m_dash;

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -55,164 +67,159 @@ wxPenRefData::wxPenRefData( const wxPenRefData& data )
 
 IMPLEMENT_DYNAMIC_CLASS(wxPen,wxGDIObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxPen,wxGDIObject)
 

-wxPen::wxPen(void)
+wxPen::wxPen()

 {
 {

-  if (wxThePenList) wxThePenList->AddPen( this );
+    if (wxThePenList) wxThePenList->AddPen( this );

 }
 
 wxPen::wxPen( const wxColour &colour, int width, int style )
 {
 }
 
 wxPen::wxPen( const wxColour &colour, int width, int style )
 {

-  m_refData = new wxPenRefData();
-  M_PENDATA->m_width = width;
-  M_PENDATA->m_style = style;
-  M_PENDATA->m_colour = colour;
-  
-  if (wxThePenList) wxThePenList->AddPen( this );
-}
+    m_refData = new wxPenRefData();
+    M_PENDATA->m_width = width;
+    M_PENDATA->m_style = style;
+    M_PENDATA->m_colour = colour;

 
 

-wxPen::wxPen( const wxPen& pen )
-{
-  Ref( pen );
-  if (wxThePenList) wxThePenList->AddPen( this );
+    if (wxThePenList) wxThePenList->AddPen( this );

 }
 
 }
 

-wxPen::wxPen( const wxPen* pen )
+wxPen::wxPen( const wxPen& pen )

 {
 {

-  UnRef();
-  if (pen) Ref( *pen ); 
-  
-  if (wxThePenList) wxThePenList->AddPen( this );
+    Ref( pen );
+    if (wxThePenList) wxThePenList->AddPen( this );

 }
 
 }
 

-wxPen::~wxPen(void)
+wxPen::~wxPen()

 {
 {

-  if (wxThePenList) wxThePenList->RemovePen( this );
+    if (wxThePenList) wxThePenList->RemovePen( this );

 }
 
 wxPen& wxPen::operator = ( const wxPen& pen )
 {
 }
 
 wxPen& wxPen::operator = ( const wxPen& pen )
 {

-  if (*this == pen) return (*this); 
-  Ref( pen ); 
-  return *this; 
+    if (*this == pen) return (*this);
+    Ref( pen );
+    return *this;

 }
 
 bool wxPen::operator == ( const wxPen& pen )
 {
 }
 
 bool wxPen::operator == ( const wxPen& pen )
 {

-  return m_refData == pen.m_refData; 
+    return m_refData == pen.m_refData;

 }
 
 bool wxPen::operator != ( const wxPen& pen )
 {
 }
 
 bool wxPen::operator != ( const wxPen& pen )
 {

-  return m_refData != pen.m_refData; 
+    return m_refData != pen.m_refData;

 }
 
 void wxPen::SetColour( const wxColour &colour )
 {
 }
 
 void wxPen::SetColour( const wxColour &colour )
 {

-  Unshare();
-  M_PENDATA->m_colour = colour;
+    Unshare();
+    M_PENDATA->m_colour = colour;
+}
+
+void wxPen::SetDashes( int number_of_dashes, const wxDash *dash )
+{
+    Unshare();
+    M_PENDATA->m_countDashes = number_of_dashes;
+    M_PENDATA->m_dash = (wxDash *)dash; /* TODO */

 }
 
 void wxPen::SetColour( int red, int green, int blue )
 {
 }
 
 void wxPen::SetColour( int red, int green, int blue )
 {

-  Unshare();
-  M_PENDATA->m_colour.Set( red, green, blue );
+    Unshare();
+    M_PENDATA->m_colour.Set( red, green, blue );

 }
 
 void wxPen::SetCap( int capStyle )
 {
 }
 
 void wxPen::SetCap( int capStyle )
 {

-  Unshare();
-  M_PENDATA->m_capStyle = capStyle;
+    Unshare();
+    M_PENDATA->m_capStyle = capStyle;

 }
 
 void wxPen::SetJoin( int joinStyle )
 {
 }
 
 void wxPen::SetJoin( int joinStyle )
 {

-  Unshare();
-  M_PENDATA->m_joinStyle = joinStyle;
+    Unshare();
+    M_PENDATA->m_joinStyle = joinStyle;

 }
 
 void wxPen::SetStyle( int style )
 {
 }
 
 void wxPen::SetStyle( int style )
 {

-  Unshare();
-  M_PENDATA->m_style = style;
+    Unshare();
+    M_PENDATA->m_style = style;

 }
 
 void wxPen::SetWidth( int width )
 {
 }
 
 void wxPen::SetWidth( int width )
 {

-  Unshare();
-  M_PENDATA->m_width = width;
+    Unshare();
+    M_PENDATA->m_width = width;
+}
+
+int wxPen::GetDashes( wxDash **ptr ) const 
+{
+     *ptr = (M_PENDATA ? M_PENDATA->m_dash : (wxDash*) NULL); 
+     return (M_PENDATA ? M_PENDATA->m_countDashes : 0);
+}
+
+int wxPen::GetDashCount() const 
+{ 
+    return (M_PENDATA->m_countDashes); 
+}
+
+wxDash* wxPen::GetDash() const 
+{ 
+    return (M_PENDATA->m_dash); 

 }
 
 }
 

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

 {
 {

-  if (!m_refData)
-  {
-    wxFAIL_MSG( "invalid pen" );
-    return -1;
-  }
-  
-  return M_PENDATA->m_capStyle;
+    wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
+
+    return M_PENDATA->m_capStyle;

 }
 
 }
 

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

 {
 {

-  if (!m_refData)
-  {
-    wxFAIL_MSG( "invalid pen" );
-    return -1;
-  }
-  
-  return M_PENDATA->m_joinStyle;
+    wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
+
+    return M_PENDATA->m_joinStyle;

 }
 
 }
 

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

 {
 {

-  if (!m_refData)
-  {
-    wxFAIL_MSG( "invalid pen" );
-    return -1;
-  }
-  
-  return M_PENDATA->m_style;
+    wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
+
+    return M_PENDATA->m_style;

 }
 
 }
 

-int wxPen::GetWidth(void) const
+int wxPen::GetWidth() const

 {
 {

-  if (!m_refData)
-  {
-    wxFAIL_MSG( "invalid pen" );
-    return -1;
-  }
-  
-  return M_PENDATA->m_width;
+    wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
+
+    return M_PENDATA->m_width;

 }
 
 }
 

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

 {
 {

-  if (!m_refData)
-  {
-    wxFAIL_MSG( "invalid pen" );
-    return wxNullColour;
-  }
-  
-  return M_PENDATA->m_colour;
+    wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid pen") );
+
+    return M_PENDATA->m_colour;

 }
 
 }
 

-bool wxPen::Ok(void) const
+bool wxPen::Ok() const

 {
 {

-  return (m_refData != NULL);
+    return (m_refData != NULL);

 }
 
 }
 

-void wxPen::Unshare(void)
+void wxPen::Unshare()

 {
 {

-  if (!m_refData)
-  {
-    m_refData = new wxPenRefData();
-  }
-  else
-  {
-    wxPenRefData* ref = new wxPenRefData( *(wxPenRefData*)m_refData );
-    UnRef();
-    m_refData = ref;
-  }
+    if (!m_refData)
+    {
+        m_refData = new wxPenRefData();
+    }
+    else
+    {
+        wxPenRefData* ref = new wxPenRefData( *(wxPenRefData*)m_refData );
+        UnRef();
+        m_refData = ref;
+    }

 }
 
 }