attempt to fix endian problems when doing cross-compiles for universal binaries from...

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

diff --git a/include/wx/gtk/pen.h b/include/wx/gtk/pen.h
index 218116ce8af7f61f7640d73029a45dfbb54af09b..38ae0b9a98418927dfc5a576960662d4488e003a 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$
@@ -7,59 +7,53 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
 #ifndef __GTKPENH__
 #define __GTKPENH__
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/gdiobj.h"
 #include "wx/gdicmn.h"
 
-#include <gtk/gtk.h>
-
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
-class wxPen;
+class WXDLLIMPEXP_CORE wxPen;
 
-typedef    wxInt8 wxDash;
-
-#if GTK_CHECK_VERSION(1,2,7)
 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, int style );
-    wxPen( const wxPen& pen );
+    wxPen() { }
+
+    wxPen( const wxColour &colour, int width = 1, int style = wxSOLID );
     ~wxPen();
-    wxPen& operator = ( const wxPen& pen );
-    bool operator == ( const wxPen& pen );
-    bool operator != ( const wxPen& pen );
+
+    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;
@@ -68,12 +62,12 @@ public:
     int GetDashes(wxDash **ptr) const;
     int GetDashCount() const;
     wxDash* GetDash() const;
-    
-    bool Ok() const;
 
-    void Unshare();
+private:
+    // ref counting code
+    virtual wxObjectRefData *CreateRefData() const;
+    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
 
-private:    
     DECLARE_DYNAMIC_CLASS(wxPen)
 };