projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
typo fixes
[wxWidgets.git]
/
include
/
wx
/
gtk
/
pen.h
diff --git
a/include/wx/gtk/pen.h
b/include/wx/gtk/pen.h
index 7e6f2c733569e6884b0a61066b1fa292a85ae850..cf1464fdb13360fe1e3f49798d776d82cb2106bc 100644
(file)
--- a/
include/wx/gtk/pen.h
+++ b/
include/wx/gtk/pen.h
@@
-27,7
+27,7
@@
class wxPen;
class wxPen;
-#if
def __WXGTK127__
+#if
defined(__WXGTK127__) || defined(__WXGTK20__)
typedef gint8 wxGTKDash;
#else
typedef gchar wxGTKDash;
typedef gint8 wxGTKDash;
#else
typedef gchar wxGTKDash;
@@
-40,13
+40,18
@@
typedef gchar wxGTKDash;
class wxPen: public wxGDIObject
{
public:
class wxPen: public wxGDIObject
{
public:
- wxPen();
+ wxPen() { }
+
wxPen( const wxColour &colour, int width, int style );
wxPen( const wxColour &colour, int width, int style );
- wxPen( const wxPen& pen );
~wxPen();
~wxPen();
- wxPen& operator = ( const wxPen& pen );
+
+ wxPen( const wxPen& pen ) { Ref(pen); }
+ wxPen& operator = ( const wxPen& pen ) { Ref(pen); return *this; }
+
+ bool Ok() const { return m_refData != NULL; }
+
bool operator == ( const wxPen& pen ) const;
bool operator == ( const wxPen& pen ) const;
- bool operator != (
const wxPen& pen ) const;
+ bool operator != (
const wxPen& pen) const { return !(*this == pen); }
void SetColour( const wxColour &colour );
void SetColour( int red, int green, int blue );
void SetColour( const wxColour &colour );
void SetColour( int red, int green, int blue );
@@
-64,12
+69,12
@@
public:
int GetDashes(wxDash **ptr) const;
int GetDashCount() const;
wxDash* GetDash() const;
int GetDashes(wxDash **ptr) const;
int GetDashCount() const;
wxDash* GetDash() const;
-
- bool Ok() const;
-
- void Unshare();
private:
private:
+ // ref counting code
+ virtual wxObjectRefData *CreateRefData() const;
+ virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
+
DECLARE_DYNAMIC_CLASS(wxPen)
};
DECLARE_DYNAMIC_CLASS(wxPen)
};