projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace wxComboBox::IsEmpty() with Is{List,Text}Empty().
[wxWidgets.git]
/
include
/
wx
/
mgl
/
pen.h
diff --git
a/include/wx/mgl/pen.h
b/include/wx/mgl/pen.h
index 880b6cf54c1bc8e70ab9424df51bdd0c4049ae05..6454bee1b251bf2ad75396fa9d9cce4d3d2c7124 100644
(file)
--- a/
include/wx/mgl/pen.h
+++ b/
include/wx/mgl/pen.h
@@
-27,13
+27,13
@@
class WXDLLIMPEXP_FWD_CORE wxPen;
// wxPen
//-----------------------------------------------------------------------------
// wxPen
//-----------------------------------------------------------------------------
-class WXDLL
EXPORT
wxPen : public wxPenBase
+class WXDLL
IMPEXP_CORE
wxPen : public wxPenBase
{
public:
wxPen() {}
wxPen(const wxColour &colour, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID);
{
public:
wxPen() {}
wxPen(const wxColour &colour, 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);
@@
-50,7
+50,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;
@@
-60,6
+60,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
+
// implementation:
void* GetPixPattern() const;
// implementation:
void* GetPixPattern() const;