several g++ 4 warning fixes

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

diff --git a/src/gtk1/pen.cpp b/src/gtk1/pen.cpp
index 0a785a8deea700397375a82e2074e5c37aeee60c..e7202df6e7030b1defa8f7eeb44375d76177d02e 100644 (file)
--- a/src/gtk1/pen.cpp
+++ b/src/gtk1/pen.cpp
@@ -1,234 +1,244 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:
 // Author:      Robert Roebling
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence

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

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 

-#ifdef __GNUG__
-#pragma implementation "pen.h"
+#include "wx/pen.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/colour.h"

 #endif
 
 #endif
 

-#include "wx/pen.h"
+#include <gdk/gdk.h>

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

-class wxPenRefData: public wxObjectRefData
-{
-  public:
-  
-    wxPenRefData(void);
-  
+class wxPenRefData : public wxGDIRefData
+{
+public:
+    wxPenRefData()
+    {
+        m_width = 1;
+        m_style = wxPENSTYLE_SOLID;
+        m_joinStyle = wxJOIN_ROUND;
+        m_capStyle = wxCAP_ROUND;
+        m_dash = (wxGTKDash*) NULL;
+        m_countDashes = 0;
+    }
+
+    wxPenRefData( const wxPenRefData& data )
+        : wxGDIRefData()
+    {
+        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;
+    }
+
+    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;
+    }
+

     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;
     wxColour   m_colour;

+    int        m_countDashes;
+    wxGTKDash *m_dash;

 };
 
 };
 

-wxPenRefData::wxPenRefData(void)
-{
-  m_width = 1;
-  m_style = wxSOLID;
-  m_joinStyle = wxJOIN_ROUND;
-  m_capStyle = wxCAP_ROUND;
-}
-
-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;
-}
-

 //-----------------------------------------------------------------------------
 
 #define M_PENDATA ((wxPenRefData *)m_refData)
 
 IMPLEMENT_DYNAMIC_CLASS(wxPen,wxGDIObject)
 
 //-----------------------------------------------------------------------------
 
 #define M_PENDATA ((wxPenRefData *)m_refData)
 
 IMPLEMENT_DYNAMIC_CLASS(wxPen,wxGDIObject)
 

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

 {
 {

-  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 wxColour &colour, int width, int 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 = style;
-  M_PENDATA->m_colour = colour;
-  
-  if (wxThePenList) wxThePenList->AddPen( this );
+    m_refData = new wxPenRefData();
+    M_PENDATA->m_width = width;
+    M_PENDATA->m_style = (wxPenStyle)style;
+    M_PENDATA->m_colour = colour;

 }
 }

+#endif

 
 

-wxPen::wxPen( const wxString &colourName, int width, int style )
+wxGDIRefData *wxPen::CreateGDIRefData() const

 {
 {

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

 }
 
 }
 

-wxPen::wxPen( const wxPen& pen )
+wxGDIRefData *wxPen::CloneGDIRefData(const wxGDIRefData *data) const

 {
 {

-  Ref( pen );
-  if (wxThePenList) wxThePenList->AddPen( this );
+    return new wxPenRefData(*(wxPenRefData *)data);

 }
 
 }
 

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

 {
 {

-  UnRef();
-  if (pen) Ref( *pen ); 
-  
-  if (wxThePenList) wxThePenList->AddPen( this );
-}
+    if (m_refData == pen.m_refData) return true;

 
 

-wxPen::~wxPen(void)
-{
-  if (wxThePenList) wxThePenList->RemovePen( this );
+    if (!m_refData || !pen.m_refData) return false;
+
+    return *(wxPenRefData*)m_refData == *(wxPenRefData*)pen.m_refData;

 }
 
 }
 

-wxPen& wxPen::operator = ( const wxPen& pen )
+void wxPen::SetColour( const wxColour &colour )

 {
 {

-  if (*this == pen) return (*this); 
-  Ref( pen ); 
-  return *this; 
+    AllocExclusive();
+
+    M_PENDATA->m_colour = colour;

 }
 
 }
 

-bool wxPen::operator == ( const wxPen& pen )
+void wxPen::SetDashes( int number_of_dashes, const wxDash *dash )

 {
 {

-  return m_refData == pen.m_refData; 
+    AllocExclusive();
+
+    M_PENDATA->m_countDashes = number_of_dashes;
+    M_PENDATA->m_dash = (wxGTKDash *)dash;

 }
 
 }
 

-bool wxPen::operator != ( const wxPen& pen )
+void wxPen::SetColour( unsigned char red, unsigned char green, unsigned char blue )

 {
 {

-  return m_refData != pen.m_refData; 
+    AllocExclusive();
+
+    M_PENDATA->m_colour.Set( red, green, blue );

 }
 
 }
 

-void wxPen::SetColour( const wxColour &colour )
+void wxPen::SetCap( wxPenCap capStyle )

 {
 {

-  Unshare();
-  M_PENDATA->m_colour = colour;
+    AllocExclusive();
+
+    M_PENDATA->m_capStyle = capStyle;

 }
 
 }
 

-void wxPen::SetColour( const wxString &colourName )
+void wxPen::SetJoin( wxPenJoin joinStyle )

 {
 {

-  Unshare();
-  M_PENDATA->m_colour = colourName;
+    AllocExclusive();
+
+    M_PENDATA->m_joinStyle = joinStyle;

 }
 
 }
 

-void wxPen::SetColour( int red, int green, int blue )
+void wxPen::SetStyle( wxPenStyle style )

 {
 {

-  Unshare();
-  M_PENDATA->m_colour.Set( red, green, blue );
+    AllocExclusive();
+
+    M_PENDATA->m_style = style;

 }
 
 }
 

-void wxPen::SetCap( int capStyle )
+void wxPen::SetWidth( int width )

 {
 {

-  Unshare();
-  M_PENDATA->m_capStyle = capStyle;
+    AllocExclusive();
+
+    M_PENDATA->m_width = width;

 }
 
 }
 

-void wxPen::SetJoin( int joinStyle )
+void wxPen::SetStipple(const wxBitmap& WXUNUSED(stipple))

 {
 {

-  Unshare();
-  M_PENDATA->m_joinStyle = joinStyle;
+    wxFAIL_MSG( "stippled pens not supported" );

 }
 
 }
 

-void wxPen::SetStyle( int style )
+int wxPen::GetDashes( wxDash **ptr ) const

 {
 {

-  Unshare();
-  M_PENDATA->m_style = style;
+    wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
+
+    *ptr = (wxDash*)M_PENDATA->m_dash;
+    return M_PENDATA->m_countDashes;

 }
 
 }
 

-void wxPen::SetWidth( int width )
+int wxPen::GetDashCount() const

 {
 {

-  Unshare();
-  M_PENDATA->m_width = width;
+    wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
+
+    return (M_PENDATA->m_countDashes);

 }
 
 }
 

-int wxPen::GetCap(void) const
+wxDash* wxPen::GetDash() const

 {
 {

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

 }
 
 }
 

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

 {
 {

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

 }
 
 }
 

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

 {
 {

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

 }
 
 }
 

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

 {
 {

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

 }
 
 }
 

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

 {
 {

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

 }
 
 }
 

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

 {
 {

-  return (m_refData != NULL);
+    wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid pen") );
+
+    return M_PENDATA->m_colour;

 }
 
 }
 

-void wxPen::Unshare(void)
+wxBitmap *wxPen::GetStipple() const

 {
 {

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

 }
 
 }