Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/os2/pen.h b/include/wx/os2/pen.h
index bf31b1ed3ab103eecb0eea4565bb6cabfd27de5c..9ae321a020a95f8bd6bd99498775179d45154be0 100644 (file)
--- a/include/wx/os2/pen.h
+++ b/include/wx/os2/pen.h
@@ -4,7 +4,6 @@
 // Author:      David Webster
 // Modified by:
 // Created:     10/10/99
 // Author:      David Webster
 // Modified by:
 // Created:     10/10/99

-// RCS-ID:      $Id$

 // Copyright:   (c) David Webster
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) David Webster
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -21,7 +20,7 @@ typedef long wxPMDash;
 // Pen
 // ----------------------------------------------------------------------------
 
 // Pen
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxPen : public wxPenBase
+class WXDLLIMPEXP_CORE wxPen : public wxPenBase

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


@@ -58,7 +57,7 @@ public:
     void SetCap(wxPenCap nCap);
     void SetPS(HPS hPS);
 
     void SetCap(wxPenCap nCap);
     void SetPS(HPS hPS);
 

-    wxColour& GetColour(void) const;
+    wxColour GetColour(void) const;

     int       GetWidth(void) const;
     wxPenStyle GetStyle(void) const;
     wxPenJoin  GetJoin(void) const;
     int       GetWidth(void) const;
     wxPenStyle GetStyle(void) const;
     wxPenJoin  GetJoin(void) const;


@@ -69,6 +68,11 @@ public:
     int       GetDashCount() const;
     wxBitmap* GetStipple(void) const;
 
     int       GetDashCount() const;
     wxBitmap* GetStipple(void) const;
 

+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+    wxDEPRECATED_FUTURE( void SetStyle(int style) )
+        { SetStyle((wxPenStyle)style); }
+#endif
+

     //
     // Implementation
     //
     //
     // Implementation
     //