ignore warning 4535 for VC8 too as it still seems to be harmless

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

diff --git a/include/wx/x11/pen.h b/include/wx/x11/pen.h
index 7b7937c264c86bbe09ff56f668a396549fc0e8bc..7df09ebc19f27875596e4d0effc7d14a16967d76 100644 (file)
--- a/include/wx/x11/pen.h
+++ b/include/wx/x11/pen.h
@@ -1,21 +1,17 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxPen class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxPen class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PEN_H_
 #define _WX_PEN_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PEN_H_
 #define _WX_PEN_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "pen.h"
-#endif
-

 #include "wx/gdicmn.h"
 #include "wx/gdiobj.h"
 
 #include "wx/gdicmn.h"
 #include "wx/gdiobj.h"
 


@@ -23,9 +19,9 @@
 // classes
 //-----------------------------------------------------------------------------
 
 // classes
 //-----------------------------------------------------------------------------
 

-class wxPen;
-class wxColour;
-class wxBitmap;
+class WXDLLIMPEXP_CORE wxPen;
+class WXDLLIMPEXP_CORE wxColour;
+class WXDLLIMPEXP_CORE wxBitmap;

 
 typedef char wxX11Dash;
 
 
 typedef char wxX11Dash;
 


@@ -33,25 +29,23 @@ typedef char wxX11Dash;
 // wxPen
 //-----------------------------------------------------------------------------
 
 // wxPen
 //-----------------------------------------------------------------------------
 

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

 {
 public:
     wxPen() { }
 {
 public:
     wxPen() { }

-    
+

     wxPen( const wxColour &colour, int width = 1, int style = wxSOLID );
     wxPen( const wxBitmap &stipple, int width );
     wxPen( const wxColour &colour, int width = 1, int style = wxSOLID );
     wxPen( const wxBitmap &stipple, int width );

-    ~wxPen();
-    
-    wxPen( const wxPen& pen ) { Ref(pen); }
-    wxPen& operator = ( const wxPen& pen ) { Ref(pen); return *this; }
-    
-    bool Ok() const { return m_refData != NULL; }
-    
+    virtual ~wxPen();
+
+    bool Ok() const { return IsOk(); }
+    bool IsOk() 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 );
     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 SetCap( int capStyle );
     void SetJoin( int joinStyle );
     void SetStyle( int style );


@@ -69,11 +63,11 @@ public:
     wxDash* GetDash() const;
     wxBitmap* GetStipple() const;
 
     wxDash* GetDash() const;
     wxBitmap* GetStipple() const;
 

-private:    
+protected:

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

-    
+

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