another wxUSE_DRAG_AND_DROP==0 compilation fix

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

diff --git a/include/wx/msw/pen.h b/include/wx/msw/pen.h
index 6f311678e5399d2e933a17a4d4aaee9eac07f6a9..ab4deee8b6a2e704a4d9654862f5b5ae866de766 100644 (file)
--- a/include/wx/msw/pen.h
+++ b/include/wx/msw/pen.h
@@ -19,13 +19,13 @@
 // Pen
 // ----------------------------------------------------------------------------
 
 // Pen
 // ----------------------------------------------------------------------------
 

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

 {
 public:
     wxPen() { }
     wxPen(const wxColour& col, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID);
 {
 public:
     wxPen() { }
     wxPen(const wxColour& col, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID);

-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED( wxPen(const wxColour& col, int width, wxBrushStyle style) );
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+    wxDEPRECATED_FUTURE( wxPen(const wxColour& col, int width, int style) );

 #endif
 
     wxPen(const wxBitmap& stipple, int width);
 #endif
 
     wxPen(const wxBitmap& stipple, int width);


@@ -45,7 +45,7 @@ public:
     void SetJoin(wxPenJoin join);
     void SetCap(wxPenCap cap);
 
     void SetJoin(wxPenJoin join);
     void SetCap(wxPenCap cap);
 

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

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


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

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

     // internal: wxGDIObject methods
     virtual bool RealizeResource();
     virtual bool FreeResource(bool force = false);
     // internal: wxGDIObject methods
     virtual bool RealizeResource();
     virtual bool FreeResource(bool force = false);