projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement monitoring of file descriptors in wxMotif event loop.
[wxWidgets.git]
/
include
/
wx
/
msw
/
pen.h
diff --git
a/include/wx/msw/pen.h
b/include/wx/msw/pen.h
index 412281e08be1d8747a4654b975c98fac7d141d0f..ab4deee8b6a2e704a4d9654862f5b5ae866de766 100644
(file)
--- a/
include/wx/msw/pen.h
+++ b/
include/wx/msw/pen.h
@@
-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);