prefix implementation methods of wxBitmapButton with 'GTK' to prevent shadowing of...

[wxWidgets.git] / include / wx / gtk / pen.h

diff --git a/include/wx/gtk/pen.h b/include/wx/gtk/pen.h
index 508a4e5ea01b8e5c1fa5e5dd9df83a72dd54c68c..f4ccb5f9abba71bd999dfafb38750055c6690cdb 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$
@@ -7,51 +7,37 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#ifndef _WX_GTK_PEN_H_
+#define _WX_GTK_PEN_H_
 
-#ifndef __GTKPENH__
-#define __GTKPENH__
-
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/string.h"
 #include "wx/gdiobj.h"
 #include "wx/gdicmn.h"
 
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxPen;
-
-typedef    char wxDash;
+typedef    gint8 wxGTKDash;
 
 //-----------------------------------------------------------------------------
 // wxPen
 //-----------------------------------------------------------------------------
 
-class wxPen: public wxGDIObject
+class WXDLLIMPEXP_CORE wxPen: public wxGDIObject
 {
 public:
-    wxPen();
-    wxPen( const wxColour &colour, int width, int style );
-    wxPen( const wxPen& pen );
-    ~wxPen();
-    wxPen& operator = ( const wxPen& pen );
-    bool operator == ( const wxPen& pen );
-    bool operator != ( const wxPen& pen );
+    wxPen() { }
+
+    wxPen( const wxColour &colour, int width = 1, int style = wxSOLID );
+    virtual ~wxPen();
+
+    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( unsigned char red, unsigned char green, unsigned char blue );
     void SetCap( int capStyle );
     void SetJoin( int joinStyle );
     void SetStyle( int style );
     void SetWidth( int width );
     void SetDashes( int number_of_dashes, const wxDash *dash );
-    
+
     wxColour &GetColour() const;
     int GetCap() const;
     int GetJoin() const;
@@ -60,13 +46,12 @@ public:
     int GetDashes(wxDash **ptr) const;
     int GetDashCount() const;
     wxDash* GetDash() const;
-    
-    bool Ok() const;
 
-    void Unshare();
+protected:
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 
-private:    
     DECLARE_DYNAMIC_CLASS(wxPen)
 };
 
-#endif // __GTKPENH__
+#endif // _WX_GTK_PEN_H_