use wxTextEntry in wxTextValidator (modified patch 1821743)

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

diff --git a/include/wx/gtk1/pen.h b/include/wx/gtk1/pen.h
index 17dd2ab6b321b02ae77380bd64bb50f1d4717db2..f196a8165da002f776c13fbec3ac23ac3e489883 100644 (file)
--- a/include/wx/gtk1/pen.h
+++ b/include/wx/gtk1/pen.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        wx/gtk/pen.h
+// Name:        wx/gtk1/pen.h

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -20,9 +20,9 @@
 // classes
 //-----------------------------------------------------------------------------
 
 // classes
 //-----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxPen;
+class WXDLLIMPEXP_FWD_CORE wxPen;

 
 

-#if defined(__WXGTK127__) || defined(__WXGTK20__)
+#if defined(__WXGTK127__)

 typedef    gint8 wxGTKDash;
 #else
 typedef    gchar wxGTKDash;
 typedef    gint8 wxGTKDash;
 #else
 typedef    gchar wxGTKDash;


@@ -38,20 +38,16 @@ public:
     wxPen() { }
 
     wxPen( const wxColour &colour, int width = 1, int style = wxSOLID );
     wxPen() { }
 
     wxPen( const wxColour &colour, int width = 1, int style = wxSOLID );

-    ~wxPen();
+    virtual ~wxPen();

 
 

-    wxPen( const wxPen& pen )
-        : wxGDIObject()
-        { Ref(pen); }
-    wxPen& operator = ( const wxPen& pen ) { Ref(pen); return *this; }
-
-    bool Ok() const { return m_refData != NULL; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return m_refData != NULL; }

 
     bool operator == ( const wxPen& pen ) const;
     bool operator != (const wxPen& pen) const { return !(*this == pen); }
 
     void SetColour( const wxColour &colour );
 
     bool operator == ( const wxPen& pen ) const;
     bool operator != (const wxPen& pen) const { return !(*this == pen); }
 
     void SetColour( const wxColour &colour );

-    void SetColour( const unsigned char red, const unsigned char green, const unsigned char 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 SetCap( int capStyle );
     void SetJoin( int joinStyle );
     void SetStyle( int style );