Add wxDataFormat GetMatchingPair() which wxGTK and wxMSW already had under different...

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

diff --git a/include/wx/os2/pen.h b/include/wx/os2/pen.h
index bf31b1ed3ab103eecb0eea4565bb6cabfd27de5c..5907125fc8455ef4805f435aaf705ce63fb77d18 100644 (file)
--- a/include/wx/os2/pen.h
+++ b/include/wx/os2/pen.h
@@ -21,7 +21,7 @@ typedef long wxPMDash;
 // Pen
 // ----------------------------------------------------------------------------
 
 // Pen
 // ----------------------------------------------------------------------------
 

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

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


@@ -58,7 +58,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 +69,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
     //