Removed wxOSX conditional code from generic calendar control.

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

diff --git a/include/wx/gtk1/pen.h b/include/wx/gtk1/pen.h
index 01191d03241143794f4fb4f5704e9917fddf1548..97fea928a31962b3eeb0d98a8336d140e7296ebd 100644 (file)
--- a/include/wx/gtk1/pen.h
+++ b/include/wx/gtk1/pen.h
@@ -42,8 +42,6 @@ public:
     wxDEPRECATED_FUTURE( wxPen(const wxColour& col, int width, int style) );
 #endif
 
     wxDEPRECATED_FUTURE( wxPen(const wxColour& col, int width, int style) );
 #endif
 

-    virtual ~wxPen();
-

     bool operator==(const wxPen& pen) const;
     bool operator!=(const wxPen& pen) const { return !(*this == pen); }
 
     bool operator==(const wxPen& pen) const;
     bool operator!=(const wxPen& pen) const { return !(*this == pen); }
 


@@ -54,8 +52,9 @@ public:
     void SetStyle( wxPenStyle style );
     void SetWidth( int width );
     void SetDashes( int number_of_dashes, const wxDash *dash );
     void SetStyle( wxPenStyle style );
     void SetWidth( int width );
     void SetDashes( int number_of_dashes, const wxDash *dash );

+    void SetStipple(const wxBitmap& stipple);

 
 

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

     wxPenCap GetCap() const;
     wxPenJoin GetJoin() const;
     wxPenStyle GetStyle() const;
     wxPenCap GetCap() const;
     wxPenJoin GetJoin() const;
     wxPenStyle GetStyle() const;


@@ -63,6 +62,12 @@ public:
     int GetDashes(wxDash **ptr) const;
     int GetDashCount() const;
     wxDash* GetDash() const;
     int GetDashes(wxDash **ptr) const;
     int GetDashCount() const;
     wxDash* GetDash() const;

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

 
 private:
     virtual wxGDIRefData *CreateGDIRefData() const;
 
 private:
     virtual wxGDIRefData *CreateGDIRefData() const;