Build fix.

[wxWidgets.git] / include / wx / gtk / pen.h

diff --git a/include/wx/gtk/pen.h b/include/wx/gtk/pen.h
index 800117d71ba3c2994f041ef8b334b8bd18093ec2..8be99f28b92bee723502d4a363f9f1edfc7214a0 100644 (file)
--- a/include/wx/gtk/pen.h
+++ b/include/wx/gtk/pen.h
@@ -4,17 +4,12 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
 #ifndef __GTKPENH__
 #define __GTKPENH__
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface
-#endif
-
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"
@@ -25,44 +20,35 @@
 // classes
 //-----------------------------------------------------------------------------
 
-class wxPen;
+class WXDLLIMPEXP_CORE wxPen;
 
-#if defined(__WXGTK127__) || defined(__WXGTK20__)
 typedef    gint8 wxGTKDash;
-#else
-typedef    gchar wxGTKDash;
-#endif
 
 //-----------------------------------------------------------------------------
 // wxPen
 //-----------------------------------------------------------------------------
 
-class wxPen: public wxGDIObject
+class WXDLLIMPEXP_CORE wxPen: public wxGDIObject
 {
 public:
     wxPen() { }
-    
+
     wxPen( const wxColour &colour, int width = 1, int style = wxSOLID );
     ~wxPen();
-    
-    wxPen( const wxPen& pen )
-        : wxGDIObject()
-        { Ref(pen); }
-    wxPen& operator = ( const wxPen& pen ) { Ref(pen); return *this; }
-    
+
     bool Ok() const { return m_refData != NULL; }
-    
+
     bool operator == ( const wxPen& pen ) const;
     bool operator != (const wxPen& pen) const { return !(*this == pen); }
 
     void SetColour( const wxColour &colour );
-    void SetColour( int red, int green, int blue );
+    void SetColour( unsigned char red, unsigned char green, unsigned char blue );
     void SetCap( int capStyle );
     void SetJoin( int joinStyle );
     void SetStyle( int style );
     void SetWidth( int width );
     void SetDashes( int number_of_dashes, const wxDash *dash );
-    
+
     wxColour &GetColour() const;
     int GetCap() const;
     int GetJoin() const;
@@ -72,11 +58,11 @@ public:
     int GetDashCount() const;
     wxDash* GetDash() const;
 
-private:    
+protected:
     // ref counting code
     virtual wxObjectRefData *CreateRefData() const;
     virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
-    
+
     DECLARE_DYNAMIC_CLASS(wxPen)
 };