Tinderbox build fix for wxUnivGTK build.

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

diff --git a/include/wx/gtk/pen.h b/include/wx/gtk/pen.h
index cbe0cd1ae2ec4fd4f9f36e8190f09e20a83a4bd7..8be99f28b92bee723502d4a363f9f1edfc7214a0 100644 (file)
--- a/include/wx/gtk/pen.h
+++ b/include/wx/gtk/pen.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        pen.h
+// Name:        wx/gtk/pen.h

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


@@ -7,14 +7,9 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifndef __GTKPENH__
 #define __GTKPENH__
 
 #ifndef __GTKPENH__
 #define __GTKPENH__
 

-#ifdef __GNUG__
-#pragma interface
-#endif
-

 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"


@@ -25,36 +20,35 @@
 // classes
 //-----------------------------------------------------------------------------
 
 // classes
 //-----------------------------------------------------------------------------
 

-class wxPen;
+class WXDLLIMPEXP_CORE wxPen;

 
 

-typedef    char wxDash;
+typedef    gint8 wxGTKDash;

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

-class wxPen: public wxGDIObject
+class WXDLLIMPEXP_CORE wxPen: public wxGDIObject

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxPen)
-
-  public:
+public:
+    wxPen() { }

 
 

-    wxPen();
-    wxPen( const wxColour &colour, int width, int style );
-    wxPen( const wxPen& pen );
+    wxPen( const wxColour &colour, int width = 1, int style = wxSOLID );

     ~wxPen();
     ~wxPen();

-    wxPen& operator = ( const wxPen& pen );
-    bool operator == ( const wxPen& pen );
-    bool operator != ( const wxPen& pen );
+
+    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( 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 );
     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;
     wxColour &GetColour() const;
     int GetCap() const;
     int GetJoin() const;


@@ -63,12 +57,13 @@ class wxPen: public wxGDIObject
     int GetDashes(wxDash **ptr) const;
     int GetDashCount() const;
     wxDash* GetDash() const;
     int GetDashes(wxDash **ptr) const;
     int GetDashCount() const;
     wxDash* GetDash() const;

-    
-    bool Ok() const;

 
 

-    void Unshare();
+protected:
+    // ref counting code
+    virtual wxObjectRefData *CreateRefData() const;
+    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;

 
 

-    // no data :-)
+    DECLARE_DYNAMIC_CLASS(wxPen)

 };
 
 #endif // __GTKPENH__
 };
 
 #endif // __GTKPENH__