added definition of TARGET_CARBON when compiling with non generated setup.h

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

diff --git a/include/wx/gtk1/pen.h b/include/wx/gtk1/pen.h
index cbe0cd1ae2ec4fd4f9f36e8190f09e20a83a4bd7..3ee44368e24aa1c08a8861e9669d28cca11aa2a5 100644 (file)
--- a/include/wx/gtk1/pen.h
+++ b/include/wx/gtk1/pen.h
@@ -11,7 +11,7 @@
 #ifndef __GTKPENH__
 #define __GTKPENH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface
 #endif
 
@@ -27,7 +27,11 @@
 
 class wxPen;
 
-typedef    char wxDash;
+#if defined(__WXGTK127__) || defined(__WXGTK20__)
+typedef    gint8 wxGTKDash;
+#else
+typedef    gchar wxGTKDash;
+#endif
 
 //-----------------------------------------------------------------------------
 // wxPen
@@ -35,17 +39,21 @@ typedef    char wxDash;
 
 class wxPen: public wxGDIObject
 {
-  DECLARE_DYNAMIC_CLASS(wxPen)
-
-  public:
-
-    wxPen();
+public:
+    wxPen() { }
+    
     wxPen( const wxColour &colour, int width, int style );
-    wxPen( const wxPen& pen );
     ~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 );
@@ -63,12 +71,13 @@ class wxPen: public wxGDIObject
     int GetDashes(wxDash **ptr) const;
     int GetDashCount() const;
     wxDash* GetDash() const;
-    
-    bool Ok() const;
 
-    void Unshare();
-
-    // no data :-)
+private:    
+    // ref counting code
+    virtual wxObjectRefData *CreateRefData() const;
+    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
+    
+    DECLARE_DYNAMIC_CLASS(wxPen)
 };
 
 #endif // __GTKPENH__