Temporary fix for link error to ~wxZipOutputStream()

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

diff --git a/include/wx/mgl/pen.h b/include/wx/mgl/pen.h
index aaaf0b4221066635068b87d8ffc89396cf059e88..3b69b3d054405d2e35f3d6ae3dd1839e6eb4f383 100644 (file)
--- a/include/wx/mgl/pen.h
+++ b/include/wx/mgl/pen.h
@@ -1,9 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$

-// Copyright:   (c) 2001 Vaclav Slavik
+// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


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

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

 #pragma interface "pen.h"
 #endif
 
 #pragma interface "pen.h"
 #endif
 


@@ -35,11 +35,11 @@ class WXDLLEXPORT wxPen;
 class WXDLLEXPORT wxPen: public wxGDIObject
 {
 public:
 class WXDLLEXPORT wxPen: public wxGDIObject
 {
 public:

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

     wxPen(const wxBitmap& stipple, int width);
     wxPen(const wxPen& pen);
     wxPen(const wxBitmap& stipple, int width);
     wxPen(const wxPen& pen);

-    ~wxPen();
+    ~wxPen() {}

     wxPen& operator = (const wxPen& pen);
     bool operator == (const wxPen& pen) const;
     bool operator != (const wxPen& pen) const;
     wxPen& operator = (const wxPen& pen);
     bool operator == (const wxPen& pen) const;
     bool operator != (const wxPen& pen) const;


@@ -65,11 +65,14 @@ public:
     
     bool Ok() const;
 
     
     bool Ok() const;
 

-    void Unshare();
-    

     // implementation:
     void* GetPixPattern() const;
 
     // implementation:
     void* GetPixPattern() const;
 

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

 private:    
     DECLARE_DYNAMIC_CLASS(wxPen)
 };
 private:    
     DECLARE_DYNAMIC_CLASS(wxPen)
 };