wxMSWUniv wxWindowMSW vs. wxWindow fix.

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

diff --git a/include/wx/gtk/pen.h b/include/wx/gtk/pen.h
index 2f1d51c90936f6af4bc85bb9fb0dc306c3a999f7..e71e01253fb74764a81a5b97023bdb8def977d1c 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$


@@ -11,7 +11,7 @@
 #ifndef __GTKPENH__
 #define __GTKPENH__
 
 #ifndef __GTKPENH__
 #define __GTKPENH__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface
 #endif
 
 #pragma interface
 #endif
 


@@ -21,15 +21,13 @@
 #include "wx/gdiobj.h"
 #include "wx/gdicmn.h"
 
 #include "wx/gdiobj.h"
 #include "wx/gdicmn.h"
 

-#include <gtk/gtk.h>  // only needed for wxGTKDash, should it go elsewhere..
-

 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 class wxPen;
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 class wxPen;
 

-#if GTK_CHECK_VERSION(1,2,7)
+#if defined(__WXGTK127__) || defined(__WXGTK20__)

 typedef    gint8 wxGTKDash;
 #else
 typedef    gchar wxGTKDash;
 typedef    gint8 wxGTKDash;
 #else
 typedef    gchar wxGTKDash;


@@ -42,13 +40,20 @@ typedef    gchar wxGTKDash;
 class wxPen: public wxGDIObject
 {
 public:
 class 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();

-    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( const wxColour &colour );
     void SetColour( int red, int green, int blue );


@@ -66,12 +71,12 @@ public:
     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();

 
 private:    
 
 private:    

+    // ref counting code
+    virtual wxObjectRefData *CreateRefData() const;
+    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
+    

     DECLARE_DYNAMIC_CLASS(wxPen)
 };
 
     DECLARE_DYNAMIC_CLASS(wxPen)
 };