fixed handling of accelerators using PageUp/Down keys (bug 1683613)

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

diff --git a/src/gtk/pen.cpp b/src/gtk/pen.cpp
index 3152074605dfd075b720b6568b2acc4cc060a114..498f38025d824acafccfcd34be884bb0dc8f3a7e 100644 (file)
--- a/src/gtk/pen.cpp
+++ b/src/gtk/pen.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

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


@@ -7,14 +7,16 @@
 // 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"
 

-#include "gdk/gdk.h"
+#ifndef WX_PRECOMP
+    #include "wx/colour.h"
+#endif
+
+#include <gdk/gdk.h>

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


@@ -23,33 +25,62 @@
 class wxPenRefData: public wxObjectRefData
 {
 public:
 class wxPenRefData: public wxObjectRefData
 {
 public:

+    wxPenRefData()
+    {
+        m_width = 1;
+        m_style = wxSOLID;
+        m_joinStyle = wxJOIN_ROUND;
+        m_capStyle = wxCAP_ROUND;
+        m_dash = (wxGTKDash*) NULL;
+        m_countDashes = 0;
+    }

 
 

-  wxPenRefData(void);
-  wxPenRefData(const wxPenRefData& data);
-
-  int        m_width;
-  int        m_style;
-  int        m_joinStyle;
-  int        m_capStyle;
-  wxColour   m_colour;
-};
+    wxPenRefData( const wxPenRefData& data )
+        : wxObjectRefData()
+    {
+        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;
+        m_dash = data.m_dash;
+    }

 
 

-wxPenRefData::wxPenRefData()
-{
-    m_width = 1;
-    m_style = wxSOLID;
-    m_joinStyle = wxJOIN_ROUND;
-    m_capStyle = wxCAP_ROUND;
-}
+    bool operator == (const wxPenRefData& data) const
+    {
+        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;
+    }

 
 

-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;
-}
+    int        m_width;
+    int        m_style;
+    int        m_joinStyle;
+    int        m_capStyle;
+    wxColour   m_colour;
+    int        m_countDashes;
+    wxGTKDash *m_dash;
+};

 
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 


@@ -57,136 +88,135 @@ wxPenRefData::wxPenRefData( const wxPenRefData& data )
 
 IMPLEMENT_DYNAMIC_CLASS(wxPen,wxGDIObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxPen,wxGDIObject)
 

-wxPen::wxPen()
-{
-    if (wxThePenList) wxThePenList->AddPen( this );
-}
-

 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;
 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 );
-}
-
-wxPen::wxPen( const wxPen& pen )
-{
-    Ref( pen );
-    if (wxThePenList) wxThePenList->AddPen( this );

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

-    if (wxThePenList) wxThePenList->RemovePen( this );
+    // m_refData unrefed in ~wxObject

 }
 
 }
 

-wxPen& wxPen::operator = ( const wxPen& pen )
+wxObjectRefData *wxPen::CreateRefData() const

 {
 {

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

 }
 
 }
 

-bool wxPen::operator == ( const wxPen& pen )
+wxObjectRefData *wxPen::CloneRefData(const wxObjectRefData *data) const

 {
 {

-    return m_refData == pen.m_refData;
+    return new wxPenRefData(*(wxPenRefData *)data);

 }
 
 }
 

-bool wxPen::operator != ( const wxPen& pen )
+bool wxPen::operator == ( const wxPen& pen ) const

 {
 {

-    return m_refData != 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 )
 {
 }
 
 void wxPen::SetColour( const wxColour &colour )
 {

-    Unshare();
+    AllocExclusive();
+

     M_PENDATA->m_colour = colour;
 }
 
     M_PENDATA->m_colour = colour;
 }
 

-void wxPen::SetColour( int red, int green, int blue )
+void wxPen::SetDashes( int number_of_dashes, const wxDash *dash )
+{
+    AllocExclusive();
+
+    M_PENDATA->m_countDashes = number_of_dashes;
+    M_PENDATA->m_dash = (wxGTKDash *)dash;
+}
+
+void wxPen::SetColour( unsigned char red, unsigned char green, unsigned char blue )

 {
 {

-    Unshare();
+    AllocExclusive();
+

     M_PENDATA->m_colour.Set( red, green, blue );
 }
 
 void wxPen::SetCap( int capStyle )
 {
     M_PENDATA->m_colour.Set( red, green, blue );
 }
 
 void wxPen::SetCap( int capStyle )
 {

-    Unshare();
+    AllocExclusive();
+

     M_PENDATA->m_capStyle = capStyle;
 }
 
 void wxPen::SetJoin( int joinStyle )
 {
     M_PENDATA->m_capStyle = capStyle;
 }
 
 void wxPen::SetJoin( int joinStyle )
 {

-    Unshare();
+    AllocExclusive();
+

     M_PENDATA->m_joinStyle = joinStyle;
 }
 
 void wxPen::SetStyle( int style )
 {
     M_PENDATA->m_joinStyle = joinStyle;
 }
 
 void wxPen::SetStyle( int style )
 {

-    Unshare();
+    AllocExclusive();
+

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

-    Unshare();
+    AllocExclusive();
+

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

+int wxPen::GetDashes( wxDash **ptr ) const
+{
+     *ptr = (M_PENDATA ? (wxDash*)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 (wxDash*)M_PENDATA->m_dash;
+}
+

 int wxPen::GetCap() const
 {
 int wxPen::GetCap() const
 {

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

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

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

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

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

 
     return M_PENDATA->m_width;
 }
 
 wxColour &wxPen::GetColour() const
 {
 
     return M_PENDATA->m_width;
 }
 
 wxColour &wxPen::GetColour() const
 {

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

 
     return M_PENDATA->m_colour;
 }
 
     return M_PENDATA->m_colour;
 }

-
-bool wxPen::Ok() const
-{
-    return (m_refData != NULL);
-}
-
-void wxPen::Unshare()
-{
-    if (!m_refData)
-    {
-        m_refData = new wxPenRefData();
-    }
-    else
-    {
-        wxPenRefData* ref = new wxPenRefData( *(wxPenRefData*)m_refData );
-        UnRef();
-        m_refData = ref;
-    }
-}
-