projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Compile fix
[wxWidgets.git]
/
include
/
wx
/
gtk1
/
pen.h
diff --git
a/include/wx/gtk1/pen.h
b/include/wx/gtk1/pen.h
index b54de75a51130df9e1714e3ece604d3ab61f0a33..97fea928a31962b3eeb0d98a8336d140e7296ebd 100644
(file)
--- a/
include/wx/gtk1/pen.h
+++ b/
include/wx/gtk1/pen.h
@@
-54,7
+54,7
@@
public:
void SetDashes( int number_of_dashes, const wxDash *dash );
void SetStipple(const wxBitmap& stipple);
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;
@@
-64,6
+64,11
@@
public:
wxDash* GetDash() const;
wxBitmap *GetStipple() 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;
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
private:
virtual wxGDIRefData *CreateGDIRefData() const;
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;