projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added wxGetX11Display() returning the pointer of the correct type, unlike the old...
[wxWidgets.git]
/
include
/
wx
/
cocoa
/
pen.h
diff --git
a/include/wx/cocoa/pen.h
b/include/wx/cocoa/pen.h
index 71e376857fb810c4af4d1e2067bd0681963bcfdb..6f14b7831829bf0e1e7948d2258e372e296cf547 100644
(file)
--- a/
include/wx/cocoa/pen.h
+++ b/
include/wx/cocoa/pen.h
@@
-6,7
+6,7
@@
// Created: 2003/08/02 (stubs from 22.03.2003)
// RCS-ID: $Id$
// Copyright: (c) 2003 David Elliott
// Created: 2003/08/02 (stubs from 22.03.2003)
// RCS-ID: $Id$
// Copyright: (c) 2003 David Elliott
-// Licence:
wxWidget
s licence
+// Licence:
wxWindow
s licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __WX_COCOA_PEN_H__
/////////////////////////////////////////////////////////////////////////////
#ifndef __WX_COCOA_PEN_H__
@@
-28,23
+28,19
@@
public:
wxPen();
wxPen(const wxColour& col, int width = 1, int style = wxSOLID);
wxPen(const wxBitmap& stipple, int width);
wxPen();
wxPen(const wxColour& col, int width = 1, int style = wxSOLID);
wxPen(const wxBitmap& stipple, int width);
- wxPen(const wxPen& pen)
- : wxGDIObject()
- { Ref(pen); }
- ~wxPen();
+ virtual ~wxPen();
// wxObjectRefData
wxObjectRefData *CreateRefData() const;
wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
// wxObjectRefData
wxObjectRefData *CreateRefData() const;
wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
- inline wxPen& operator = (const wxPen& pen)
- { if (*this == pen) return (*this); Ref(pen); return *this; }
- inline bool operator == (const wxPen& pen)
+ inline bool operator == (const wxPen& pen) const
{ return m_refData == pen.m_refData; }
{ return m_refData == pen.m_refData; }
- inline bool operator != (const wxPen& pen)
+ inline bool operator != (const wxPen& pen)
const
{ return m_refData != pen.m_refData; }
{ return m_refData != pen.m_refData; }
- virtual bool Ok() const { return (m_refData != NULL) ; }
+ virtual bool Ok() const { return IsOk(); }
+ virtual bool IsOk() const { return (m_refData != NULL) ; }
void SetColour(const wxColour& col) ;
void SetColour(unsigned char r, unsigned char g, unsigned char b) ;
void SetColour(const wxColour& col) ;
void SetColour(unsigned char r, unsigned char g, unsigned char b) ;