check in the 'selective yield' patch (see ticket #10320):

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

diff --git a/src/gtk1/pen.cpp b/src/gtk1/pen.cpp
index 7ba9b5940d8aab67a040861fca2e93d4557b75f8..8fa09cd73f178d2204351bacbeb75b949f5cf1ec 100644 (file)
--- a/src/gtk1/pen.cpp
+++ b/src/gtk1/pen.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        pen.cpp
+// Name:        src/gtk1/pen.cpp

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


@@ -7,33 +7,36 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-
-#ifdef __GNUG__
-#pragma implementation "pen.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

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

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

 #include <gdk/gdk.h>
 
 //-----------------------------------------------------------------------------
 // wxPen
 //-----------------------------------------------------------------------------
 
 #include <gdk/gdk.h>
 
 //-----------------------------------------------------------------------------
 // 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 = (wxGTKDash*) NULL;
+        m_dash = NULL;

         m_countDashes = 0;
     }
         m_countDashes = 0;
     }

-    
+

     wxPenRefData( const wxPenRefData& data )
     wxPenRefData( const wxPenRefData& data )

+        : wxGDIRefData()

     {
         m_style = data.m_style;
         m_width = data.m_width;
     {
         m_style = data.m_style;
         m_width = data.m_width;


@@ -41,26 +44,39 @@ public:
         m_capStyle = data.m_capStyle;
         m_colour = data.m_colour;
         m_countDashes = data.m_countDashes;
         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;
     }
 
     bool operator == (const wxPenRefData& data) const
     {
         m_dash = data.m_dash;
     }
 
     bool operator == (const wxPenRefData& data) const
     {

-        return (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);
+        if ( m_countDashes != data.m_countDashes )
+            return false;
+
+        if ( m_dash )
+        {
+            if ( !data.m_dash ||
+                 memcmp(m_dash, data.m_dash, m_countDashes*sizeof(wxGTKDash)) )
+            {
+                return false;
+            }
+        }
+        else if ( data.m_dash )
+        {
+            return false;
+        }
+
+
+        return 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;

     }
     }

-            
+

     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;
     wxGTKDash *m_dash;
     wxColour   m_colour;
     int        m_countDashes;
     wxGTKDash *m_dash;


@@ -72,7 +88,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;


@@ -80,113 +96,129 @@ wxPen::wxPen( const wxColour &colour, int width, int style )
     M_PENDATA->m_colour = colour;
 }
 
     M_PENDATA->m_colour = colour;
 }
 

-wxPen::~wxPen()
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+wxPen::wxPen(const wxColour& colour, int width, int style)

 {
 {

-    // m_refData unrefed in ~wxObject
+    m_refData = new wxPenRefData();
+    M_PENDATA->m_width = width;
+    M_PENDATA->m_style = (wxPenStyle)style;
+    M_PENDATA->m_colour = colour;

 }
 }

+#endif

 
 

-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);
 }
 
 bool wxPen::operator == ( const wxPen& pen ) const
 {
 {
     return new wxPenRefData(*(wxPenRefData *)data);
 }
 
 bool wxPen::operator == ( const wxPen& pen ) const
 {

-    if (m_refData == pen.m_refData) return TRUE;
-    
-    if (!m_refData || !pen.m_refData) return FALSE;
-    
-    return ( *(wxPenRefData*)m_refData == *(wxPenRefData*)pen.m_refData );
+    if (m_refData == pen.m_refData) return true;
+
+    if (!m_refData || !pen.m_refData) return false;
+
+    return *(wxPenRefData*)m_refData == *(wxPenRefData*)pen.m_refData;

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

-    
+

     M_PENDATA->m_colour = colour;
 }
 
 void wxPen::SetDashes( int number_of_dashes, const wxDash *dash )
 {
     AllocExclusive();
     M_PENDATA->m_colour = colour;
 }
 
 void wxPen::SetDashes( int number_of_dashes, const wxDash *dash )
 {
     AllocExclusive();

-    
+

     M_PENDATA->m_countDashes = number_of_dashes;
     M_PENDATA->m_countDashes = number_of_dashes;

-    M_PENDATA->m_dash = (wxGTKDash *)dash; /* TODO */
+    M_PENDATA->m_dash = (wxGTKDash *)dash;

 }
 
 }
 

-void wxPen::SetColour( int red, int green, int blue )
+void wxPen::SetColour( unsigned char red, unsigned char green, unsigned char blue )

 {
     AllocExclusive();
 {
     AllocExclusive();

-    
+

     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();
 {
     AllocExclusive();

-    
+

     M_PENDATA->m_capStyle = capStyle;
 }
 
     M_PENDATA->m_capStyle = capStyle;
 }
 

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

 {
     AllocExclusive();
 {
     AllocExclusive();

-    
+

     M_PENDATA->m_joinStyle = joinStyle;
 }
 
     M_PENDATA->m_joinStyle = joinStyle;
 }
 

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

 {
     AllocExclusive();
 {
     AllocExclusive();

-    
+

     M_PENDATA->m_style = style;
 }
 
 void wxPen::SetWidth( int width )
 {
     AllocExclusive();
     M_PENDATA->m_style = style;
 }
 
 void wxPen::SetWidth( int width )
 {
     AllocExclusive();

-    
+

     M_PENDATA->m_width = width;
 }
 
     M_PENDATA->m_width = width;
 }
 

+void wxPen::SetStipple(const wxBitmap& WXUNUSED(stipple))
+{
+    wxFAIL_MSG( "stippled pens not supported" );
+}
+

 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( Ok(), -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( Ok(), -1, wxT("invalid pen") );
+

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

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

     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( Ok(), 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( Ok(), 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( Ok(), wxPENSTYLE_INVALID, wxT("invalid pen") );

 
     return M_PENDATA->m_style;
 }
 
     return M_PENDATA->m_style;
 }


@@ -198,10 +230,15 @@ int wxPen::GetWidth() const
     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") );
 
     return M_PENDATA->m_colour;
 }
 
 {
     wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid pen") );
 
     return M_PENDATA->m_colour;
 }
 

+wxBitmap *wxPen::GetStipple() const
+{
+    return NULL;
+}
+