projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hopefully fixed library names generated by wx-config for OS/2's PM port.
[wxWidgets.git]
/
include
/
wx
/
gtk
/
pen.h
diff --git
a/include/wx/gtk/pen.h
b/include/wx/gtk/pen.h
index 20d09c2ed4c541d9a72cb7782f49b8705fa64d74..e71e01253fb74764a81a5b97023bdb8def977d1c 100644
(file)
--- a/
include/wx/gtk/pen.h
+++ b/
include/wx/gtk/pen.h
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: pen.h
+// Name:
wx/gtk/
pen.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Purpose:
// Author: Robert Roebling
// Id: $Id$
@@
-11,7
+11,7
@@
#ifndef __GTKPENH__
#define __GTKPENH__
#ifndef __GTKPENH__
#define __GTKPENH__
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface
#endif
#pragma interface
#endif
@@
-40,13
+40,20
@@
typedef gchar wxGTKDash;
class wxPen: public wxGDIObject
{
public:
class wxPen: public wxGDIObject
{
public:
- wxPen()
;
- wxPen( const wxColour &colour, int width, int style );
- wxPen( const wx
Pen& pen
);
+ wxPen()
{ }
+
+ wxPen( const wx
Colour &colour, int width = 1, int style = wxSOLID
);
~wxPen();
~wxPen();
- wxPen& operator = ( const wxPen& pen );
+
+ wxPen( const wxPen& pen )
+ : wxGDIObject()
+ { 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
+71,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)
};