projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Enable variadic macros for VC9 and later.
[wxWidgets.git]
/
include
/
wx
/
gtk
/
pen.h
diff --git
a/include/wx/gtk/pen.h
b/include/wx/gtk/pen.h
index f607a1be83694c394e43e32a1a09a3304efe0caf..2437073efbe8e4236e4a0266dfc9c7e0da09cb56 100644
(file)
--- a/
include/wx/gtk/pen.h
+++ b/
include/wx/gtk/pen.h
@@
-10,7
+10,7
@@
#ifndef _WX_GTK_PEN_H_
#define _WX_GTK_PEN_H_
#ifndef _WX_GTK_PEN_H_
#define _WX_GTK_PEN_H_
-typedef
gint8
wxGTKDash;
+typedef
signed char
wxGTKDash;
//-----------------------------------------------------------------------------
// wxPen
//-----------------------------------------------------------------------------
// wxPen
@@
-22,8
+22,8
@@
public:
wxPen() { }
wxPen( const wxColour &colour, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID );
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
virtual ~wxPen();
#endif
virtual ~wxPen();
@@
-40,7
+40,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;
@@
-50,6
+50,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
+
protected:
virtual wxGDIRefData *CreateGDIRefData() const;
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
protected:
virtual wxGDIRefData *CreateGDIRefData() const;
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;