graphics context additions and merging graphics bitmap additions from Kevin O.

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

diff --git a/src/gtk1/pen.cpp b/src/gtk1/pen.cpp
index cecc379b8538d3a57846d7cfac1e76c7979dc51c..008a98cb1a6be6f87c7ada76b5ff36fc0d873875 100644 (file)
--- a/src/gtk1/pen.cpp
+++ b/src/gtk1/pen.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        src/gtk/pen.cpp
+// Name:        src/gtk1/pen.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -11,7 +11,10 @@
 #include "wx/wxprec.h"
 
 #include "wx/pen.h"
-#include "wx/colour.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/colour.h"
+#endif
 
 #include <gdk/gdk.h>
 
@@ -19,7 +22,7 @@
 // wxPen
 //-----------------------------------------------------------------------------
 
-class wxPenRefData: public wxObjectRefData
+class wxPenRefData : public wxGDIRefData
 {
 public:
     wxPenRefData()
@@ -33,7 +36,7 @@ public:
     }
 
     wxPenRefData( const wxPenRefData& data )
-        : wxObjectRefData()
+        : wxGDIRefData()
     {
         m_style = data.m_style;
         m_width = data.m_width;
@@ -98,12 +101,12 @@ wxPen::~wxPen()
     // m_refData unrefed in ~wxObject
 }
 
-wxObjectRefData *wxPen::CreateRefData() const
+wxGDIRefData *wxPen::CreateGDIRefData() const
 {
     return new wxPenRefData;
 }
 
-wxObjectRefData *wxPen::CloneRefData(const wxObjectRefData *data) const
+wxGDIRefData *wxPen::CloneGDIRefData(const wxGDIRefData *data) const
 {
     return new wxPenRefData(*(wxPenRefData *)data);
 }
@@ -132,7 +135,7 @@ void wxPen::SetDashes( int number_of_dashes, const wxDash *dash )
     M_PENDATA->m_dash = (wxGTKDash *)dash;
 }
 
-void wxPen::SetColour( const unsigned char red, const unsigned char green, const unsigned char blue )
+void wxPen::SetColour( unsigned char red, unsigned char green, unsigned char blue )
 {
     AllocExclusive();